Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c020d7b authored by Paul Burton's avatar Paul Burton Committed by David S. Miller
Browse files

net: pch_gbe: Remove read_mac_addr HAL abstraction 



For some reason the pch_gbe driver contains a struct pch_gbe_functions
with pointers used by a HAL abstraction layer, even though there is only
one implementation of each function.

This patch removes the read_mac_addr abstraction in favor of calling
pch_gbe_mac_read_mac_addr directly. Since this is defined in the same
translation unit as all of its callers, we can make it static & remove
it from the pch_gbe.h header.

Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ac6c0e0a

drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h

+0 −3
Original line number Diff line number Diff line
@@ -336,7 +336,6 @@ struct pch_gbe_hw; 
 * @write_phy_reg:	for pch_gbe_hal_write_phy_reg

 * @reset_phy:		for pch_gbe_hal_phy_hw_reset

 * @sw_reset_phy:	for pch_gbe_hal_phy_sw_reset

 * @read_mac_addr:	for pch_gbe_hal_read_mac_addr

 */

struct pch_gbe_functions {

	void (*get_bus_info) (struct pch_gbe_hw *);
@@ -345,7 +344,6 @@ struct pch_gbe_functions { 
	s32 (*write_phy_reg) (struct pch_gbe_hw *, u32, u16);

	void (*reset_phy) (struct pch_gbe_hw *);

	void (*sw_reset_phy) (struct pch_gbe_hw *);

	s32 (*read_mac_addr) (struct pch_gbe_hw *);

};



/**
@@ -676,7 +674,6 @@ void pch_gbe_set_ethtool_ops(struct net_device *netdev); 


/* pch_gbe_mac.c */

s32 pch_gbe_mac_force_mac_fc(struct pch_gbe_hw *hw);

s32 pch_gbe_mac_read_mac_addr(struct pch_gbe_hw *hw);

u16 pch_gbe_mac_ctrl_miim(struct pch_gbe_hw *hw, u32 addr, u32 dir, u32 reg,

			  u16 data);

#endif /* _PCH_GBE_H_ */

drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.c

+0 −19
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ static const struct pch_gbe_functions pch_gbe_ops = { 
	.write_phy_reg     = pch_gbe_phy_write_reg_miic,

	.reset_phy         = pch_gbe_phy_hw_reset,

	.sw_reset_phy      = pch_gbe_phy_sw_reset,

	.read_mac_addr     = pch_gbe_mac_read_mac_addr

};



/**
@@ -220,21 +219,3 @@ void pch_gbe_hal_phy_sw_reset(struct pch_gbe_hw *hw) 
	}

	hw->func->sw_reset_phy(hw);

}
 


/**

 * pch_gbe_hal_read_mac_addr - Reads MAC address

 * @hw:	Pointer to the HW structure

 * Returns:

 *	0:	Successfully

 *	ENOSYS:	Function is not registered

 */

s32 pch_gbe_hal_read_mac_addr(struct pch_gbe_hw *hw)

{

	if (!hw->func->read_mac_addr) {

		struct pch_gbe_adapter *adapter = pch_gbe_hw_to_adapter(hw);



		netdev_err(adapter->netdev, "ERROR: configuration\n");

		return -ENOSYS;

	}

	return hw->func->read_mac_addr(hw);

}

drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_api.h

+0 −1
Original line number Diff line number Diff line
@@ -28,6 +28,5 @@ s32 pch_gbe_hal_read_phy_reg(struct pch_gbe_hw *hw, u32 offset, u16 *data); 
s32 pch_gbe_hal_write_phy_reg(struct pch_gbe_hw *hw, u32 offset, u16 data);

void pch_gbe_hal_phy_hw_reset(struct pch_gbe_hw *hw);

void pch_gbe_hal_phy_sw_reset(struct pch_gbe_hw *hw);

s32 pch_gbe_hal_read_mac_addr(struct pch_gbe_hw *hw);



#endif

drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c

+2 −2
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static inline void pch_gbe_mac_load_mac_addr(struct pch_gbe_hw *hw) 
 * Returns:

 *	0:			Successful.

 */

s32 pch_gbe_mac_read_mac_addr(struct pch_gbe_hw *hw)

static s32 pch_gbe_mac_read_mac_addr(struct pch_gbe_hw *hw)

{

	struct pch_gbe_adapter *adapter = pch_gbe_hw_to_adapter(hw);

	u32  adr1a, adr1b;
@@ -2627,7 +2627,7 @@ static int pch_gbe_probe(struct pci_dev *pdev, 
	pch_gbe_hal_get_bus_info(&adapter->hw);



	/* Read the MAC address. and store to the private data */

	ret = pch_gbe_hal_read_mac_addr(&adapter->hw);

	ret = pch_gbe_mac_read_mac_addr(&adapter->hw);

	if (ret) {

		dev_err(&pdev->dev, "MAC address Read Error\n");

		goto err_free_adapter;