Commit ed72bd5a authored by Simon Horman's avatar Simon Horman Committed by David S. Miller
Browse files

ksz884x: Remove unused functions 



Remove unused functions.

These functions may have some value in documenting the
hardware. But that information may be accessed via SCM history.

Flagged by clang-16 with W=1.
No functional change intended.
Compile tested only.

Signed-off-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent be690daa

drivers/net/ethernet/micrel/ksz884x.c

+0 −294
Original line number Diff line number Diff line
@@ -1476,15 +1476,6 @@ static void hw_turn_on_intr(struct ksz_hw *hw, u32 bit) 
		hw_set_intr(hw, hw->intr_mask);

}



static inline void hw_ena_intr_bit(struct ksz_hw *hw, uint interrupt)

{

	u32 read_intr;



	read_intr = readl(hw->io + KS884X_INTERRUPTS_ENABLE);

	hw->intr_set = read_intr | interrupt;

	writel(hw->intr_set, hw->io + KS884X_INTERRUPTS_ENABLE);

}



static inline void hw_read_intr(struct ksz_hw *hw, uint *status)

{

	*status = readl(hw->io + KS884X_INTERRUPTS_STATUS);
@@ -1853,29 +1844,6 @@ static void port_init_cnt(struct ksz_hw *hw, int port) 
 * Port functions

 */



/**

 * port_chk - check port register bits

 * @hw: 	The hardware instance.

 * @port:	The port index.

 * @offset:	The offset of the port register.

 * @bits:	The data bits to check.

 *

 * This function checks whether the specified bits of the port register are set

 * or not.

 *

 * Return 0 if the bits are not set.

 */

static int port_chk(struct ksz_hw *hw, int port, int offset, u16 bits)

{

	u32 addr;

	u16 data;



	PORT_CTRL_ADDR(port, addr);

	addr += offset;

	data = readw(hw->io + addr);

	return (data & bits) == bits;

}



/**

 * port_cfg - set port register bits

 * @hw: 	The hardware instance.
@@ -1902,53 +1870,6 @@ static void port_cfg(struct ksz_hw *hw, int port, int offset, u16 bits, 
	writew(data, hw->io + addr);

}



/**

 * port_chk_shift - check port bit

 * @hw: 	The hardware instance.

 * @port:	The port index.

 * @addr:	The offset of the register.

 * @shift:	Number of bits to shift.

 *

 * This function checks whether the specified port is set in the register or

 * not.

 *

 * Return 0 if the port is not set.

 */

static int port_chk_shift(struct ksz_hw *hw, int port, u32 addr, int shift)

{

	u16 data;

	u16 bit = 1 << port;



	data = readw(hw->io + addr);

	data >>= shift;

	return (data & bit) == bit;

}



/**

 * port_cfg_shift - set port bit

 * @hw: 	The hardware instance.

 * @port:	The port index.

 * @addr:	The offset of the register.

 * @shift:	Number of bits to shift.

 * @set:	The flag indicating whether the port is to be set or not.

 *

 * This routine sets or resets the specified port in the register.

 */

static void port_cfg_shift(struct ksz_hw *hw, int port, u32 addr, int shift,

	int set)

{

	u16 data;

	u16 bits = 1 << port;



	data = readw(hw->io + addr);

	bits <<= shift;

	if (set)

		data |= bits;

	else

		data &= ~bits;

	writew(data, hw->io + addr);

}



/**

 * port_r8 - read byte from port register

 * @hw: 	The hardware instance.
@@ -2051,12 +1972,6 @@ static inline void port_cfg_broad_storm(struct ksz_hw *hw, int p, int set) 
		KS8842_PORT_CTRL_1_OFFSET, PORT_BROADCAST_STORM, set);

}



static inline int port_chk_broad_storm(struct ksz_hw *hw, int p)

{

	return port_chk(hw, p,

		KS8842_PORT_CTRL_1_OFFSET, PORT_BROADCAST_STORM);

}



/* Driver set switch broadcast storm protection at 10% rate. */

#define BROADCAST_STORM_PROTECTION_RATE	10
@@ -2209,102 +2124,6 @@ static inline void port_cfg_back_pressure(struct ksz_hw *hw, int p, int set) 
		KS8842_PORT_CTRL_2_OFFSET, PORT_BACK_PRESSURE, set);

}



static inline void port_cfg_force_flow_ctrl(struct ksz_hw *hw, int p, int set)

{

	port_cfg(hw, p,

		KS8842_PORT_CTRL_2_OFFSET, PORT_FORCE_FLOW_CTRL, set);

}



static inline int port_chk_back_pressure(struct ksz_hw *hw, int p)

{

	return port_chk(hw, p,

		KS8842_PORT_CTRL_2_OFFSET, PORT_BACK_PRESSURE);

}



static inline int port_chk_force_flow_ctrl(struct ksz_hw *hw, int p)

{

	return port_chk(hw, p,

		KS8842_PORT_CTRL_2_OFFSET, PORT_FORCE_FLOW_CTRL);

}



/* Spanning Tree */



static inline void port_cfg_rx(struct ksz_hw *hw, int p, int set)

{

	port_cfg(hw, p,

		KS8842_PORT_CTRL_2_OFFSET, PORT_RX_ENABLE, set);

}



static inline void port_cfg_tx(struct ksz_hw *hw, int p, int set)

{

	port_cfg(hw, p,

		KS8842_PORT_CTRL_2_OFFSET, PORT_TX_ENABLE, set);

}



static inline void sw_cfg_fast_aging(struct ksz_hw *hw, int set)

{

	sw_cfg(hw, KS8842_SWITCH_CTRL_1_OFFSET, SWITCH_FAST_AGING, set);

}



static inline void sw_flush_dyn_mac_table(struct ksz_hw *hw)

{

	if (!(hw->overrides & FAST_AGING)) {

		sw_cfg_fast_aging(hw, 1);

		mdelay(1);

		sw_cfg_fast_aging(hw, 0);

	}

}



/* VLAN */



static inline void port_cfg_ins_tag(struct ksz_hw *hw, int p, int insert)

{

	port_cfg(hw, p,

		KS8842_PORT_CTRL_1_OFFSET, PORT_INSERT_TAG, insert);

}



static inline void port_cfg_rmv_tag(struct ksz_hw *hw, int p, int remove)

{

	port_cfg(hw, p,

		KS8842_PORT_CTRL_1_OFFSET, PORT_REMOVE_TAG, remove);

}



static inline int port_chk_ins_tag(struct ksz_hw *hw, int p)

{

	return port_chk(hw, p,

		KS8842_PORT_CTRL_1_OFFSET, PORT_INSERT_TAG);

}



static inline int port_chk_rmv_tag(struct ksz_hw *hw, int p)

{

	return port_chk(hw, p,

		KS8842_PORT_CTRL_1_OFFSET, PORT_REMOVE_TAG);

}



static inline void port_cfg_dis_non_vid(struct ksz_hw *hw, int p, int set)

{

	port_cfg(hw, p,

		KS8842_PORT_CTRL_2_OFFSET, PORT_DISCARD_NON_VID, set);

}



static inline void port_cfg_in_filter(struct ksz_hw *hw, int p, int set)

{

	port_cfg(hw, p,

		KS8842_PORT_CTRL_2_OFFSET, PORT_INGRESS_VLAN_FILTER, set);

}



static inline int port_chk_dis_non_vid(struct ksz_hw *hw, int p)

{

	return port_chk(hw, p,

		KS8842_PORT_CTRL_2_OFFSET, PORT_DISCARD_NON_VID);

}



static inline int port_chk_in_filter(struct ksz_hw *hw, int p)

{

	return port_chk(hw, p,

		KS8842_PORT_CTRL_2_OFFSET, PORT_INGRESS_VLAN_FILTER);

}



/* Mirroring */



static inline void port_cfg_mirror_sniffer(struct ksz_hw *hw, int p, int set)
@@ -2342,28 +2161,6 @@ static void sw_init_mirror(struct ksz_hw *hw) 
	sw_cfg_mirror_rx_tx(hw, 0);

}



static inline void sw_cfg_unk_def_deliver(struct ksz_hw *hw, int set)

{

	sw_cfg(hw, KS8842_SWITCH_CTRL_7_OFFSET,

		SWITCH_UNK_DEF_PORT_ENABLE, set);

}



static inline int sw_cfg_chk_unk_def_deliver(struct ksz_hw *hw)

{

	return sw_chk(hw, KS8842_SWITCH_CTRL_7_OFFSET,

		SWITCH_UNK_DEF_PORT_ENABLE);

}



static inline void sw_cfg_unk_def_port(struct ksz_hw *hw, int port, int set)

{

	port_cfg_shift(hw, port, KS8842_SWITCH_CTRL_7_OFFSET, 0, set);

}



static inline int sw_chk_unk_def_port(struct ksz_hw *hw, int port)

{

	return port_chk_shift(hw, port, KS8842_SWITCH_CTRL_7_OFFSET, 0);

}



/* Priority */



static inline void port_cfg_diffserv(struct ksz_hw *hw, int p, int set)
@@ -2390,30 +2187,6 @@ static inline void port_cfg_prio(struct ksz_hw *hw, int p, int set) 
		KS8842_PORT_CTRL_1_OFFSET, PORT_PRIO_QUEUE_ENABLE, set);

}



static inline int port_chk_diffserv(struct ksz_hw *hw, int p)

{

	return port_chk(hw, p,

		KS8842_PORT_CTRL_1_OFFSET, PORT_DIFFSERV_ENABLE);

}



static inline int port_chk_802_1p(struct ksz_hw *hw, int p)

{

	return port_chk(hw, p,

		KS8842_PORT_CTRL_1_OFFSET, PORT_802_1P_ENABLE);

}



static inline int port_chk_replace_vid(struct ksz_hw *hw, int p)

{

	return port_chk(hw, p,

		KS8842_PORT_CTRL_2_OFFSET, PORT_USER_PRIORITY_CEILING);

}



static inline int port_chk_prio(struct ksz_hw *hw, int p)

{

	return port_chk(hw, p,

		KS8842_PORT_CTRL_1_OFFSET, PORT_PRIO_QUEUE_ENABLE);

}



/**

 * sw_dis_diffserv - disable switch DiffServ priority

 * @hw: 	The hardware instance.
@@ -2613,23 +2386,6 @@ static void sw_cfg_port_base_vlan(struct ksz_hw *hw, int port, u8 member) 
	hw->ksz_switch->port_cfg[port].member = member;

}



/**

 * sw_get_addr - get the switch MAC address.

 * @hw: 	The hardware instance.

 * @mac_addr:	Buffer to store the MAC address.

 *

 * This function retrieves the MAC address of the switch.

 */

static inline void sw_get_addr(struct ksz_hw *hw, u8 *mac_addr)

{

	int i;



	for (i = 0; i < 6; i += 2) {

		mac_addr[i] = readb(hw->io + KS8842_MAC_ADDR_0_OFFSET + i);

		mac_addr[1 + i] = readb(hw->io + KS8842_MAC_ADDR_1_OFFSET + i);

	}

}



/**

 * sw_set_addr - configure switch MAC address

 * @hw: 	The hardware instance.
@@ -2828,56 +2584,6 @@ static inline void hw_w_phy_ctrl(struct ksz_hw *hw, int phy, u16 data) 
	writew(data, hw->io + phy + KS884X_PHY_CTRL_OFFSET);

}



static inline void hw_r_phy_link_stat(struct ksz_hw *hw, int phy, u16 *data)

{

	*data = readw(hw->io + phy + KS884X_PHY_STATUS_OFFSET);

}



static inline void hw_r_phy_auto_neg(struct ksz_hw *hw, int phy, u16 *data)

{

	*data = readw(hw->io + phy + KS884X_PHY_AUTO_NEG_OFFSET);

}



static inline void hw_w_phy_auto_neg(struct ksz_hw *hw, int phy, u16 data)

{

	writew(data, hw->io + phy + KS884X_PHY_AUTO_NEG_OFFSET);

}



static inline void hw_r_phy_rem_cap(struct ksz_hw *hw, int phy, u16 *data)

{

	*data = readw(hw->io + phy + KS884X_PHY_REMOTE_CAP_OFFSET);

}



static inline void hw_r_phy_crossover(struct ksz_hw *hw, int phy, u16 *data)

{

	*data = readw(hw->io + phy + KS884X_PHY_CTRL_OFFSET);

}



static inline void hw_w_phy_crossover(struct ksz_hw *hw, int phy, u16 data)

{

	writew(data, hw->io + phy + KS884X_PHY_CTRL_OFFSET);

}



static inline void hw_r_phy_polarity(struct ksz_hw *hw, int phy, u16 *data)

{

	*data = readw(hw->io + phy + KS884X_PHY_PHY_CTRL_OFFSET);

}



static inline void hw_w_phy_polarity(struct ksz_hw *hw, int phy, u16 data)

{

	writew(data, hw->io + phy + KS884X_PHY_PHY_CTRL_OFFSET);

}



static inline void hw_r_phy_link_md(struct ksz_hw *hw, int phy, u16 *data)

{

	*data = readw(hw->io + phy + KS884X_PHY_LINK_MD_OFFSET);

}



static inline void hw_w_phy_link_md(struct ksz_hw *hw, int phy, u16 data)

{

	writew(data, hw->io + phy + KS884X_PHY_LINK_MD_OFFSET);

}



/**

 * hw_r_phy - read data from PHY register

 * @hw: 	The hardware instance.