Skip to content

Commit a055b02

Browse files
committed
Merge branch 'pch_gbe-Cleanups'
Paul Burton says: ==================== net: pch_gbe: Cleanups This series begins the process of cleaning up the pch_gbe network driver. Whilst my ultimate goal is to add support for using this driver on the MIPS Boston development board, this series sets that aside in favor of making some more general cleanups. My hope is that this will both make the driver a little more maleable & reduce the probability of me gouging out my eyes. Applies cleanly atop net-next as of 5424ea2 ("netns: get more entropy from net_hash_mix()"). ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 5424ea2 + 418e7da commit a055b02

File tree

8 files changed

+66
-489
lines changed

8 files changed

+66
-489
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
obj-$(CONFIG_PCH_GBE) += pch_gbe.o
22

33
pch_gbe-y := pch_gbe_phy.o pch_gbe_ethtool.o pch_gbe_param.o
4-
pch_gbe-y += pch_gbe_api.o pch_gbe_main.o
4+
pch_gbe-y += pch_gbe_main.o

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

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -326,32 +326,6 @@ struct pch_gbe_regs {
326326
#define PCH_GBE_FC_FULL 3
327327
#define PCH_GBE_FC_DEFAULT PCH_GBE_FC_FULL
328328

329-
330-
struct pch_gbe_hw;
331-
/**
332-
* struct pch_gbe_functions - HAL APi function pointer
333-
* @get_bus_info: for pch_gbe_hal_get_bus_info
334-
* @init_hw: for pch_gbe_hal_init_hw
335-
* @read_phy_reg: for pch_gbe_hal_read_phy_reg
336-
* @write_phy_reg: for pch_gbe_hal_write_phy_reg
337-
* @reset_phy: for pch_gbe_hal_phy_hw_reset
338-
* @sw_reset_phy: for pch_gbe_hal_phy_sw_reset
339-
* @power_up_phy: for pch_gbe_hal_power_up_phy
340-
* @power_down_phy: for pch_gbe_hal_power_down_phy
341-
* @read_mac_addr: for pch_gbe_hal_read_mac_addr
342-
*/
343-
struct pch_gbe_functions {
344-
void (*get_bus_info) (struct pch_gbe_hw *);
345-
s32 (*init_hw) (struct pch_gbe_hw *);
346-
s32 (*read_phy_reg) (struct pch_gbe_hw *, u32, u16 *);
347-
s32 (*write_phy_reg) (struct pch_gbe_hw *, u32, u16);
348-
void (*reset_phy) (struct pch_gbe_hw *);
349-
void (*sw_reset_phy) (struct pch_gbe_hw *);
350-
void (*power_up_phy) (struct pch_gbe_hw *hw);
351-
void (*power_down_phy) (struct pch_gbe_hw *hw);
352-
s32 (*read_mac_addr) (struct pch_gbe_hw *);
353-
};
354-
355329
/**
356330
* struct pch_gbe_mac_info - MAC information
357331
* @addr[6]: Store the MAC address
@@ -392,17 +366,6 @@ struct pch_gbe_phy_info {
392366
u16 autoneg_advertised;
393367
};
394368

395-
/*!
396-
* @ingroup Gigabit Ether driver Layer
397-
* @struct pch_gbe_bus_info
398-
* @brief Bus information
399-
*/
400-
struct pch_gbe_bus_info {
401-
u8 type;
402-
u8 speed;
403-
u8 width;
404-
};
405-
406369
/*!
407370
* @ingroup Gigabit Ether driver Layer
408371
* @struct pch_gbe_hw
@@ -414,10 +377,8 @@ struct pch_gbe_hw {
414377
struct pch_gbe_regs __iomem *reg;
415378
spinlock_t miim_lock;
416379

417-
const struct pch_gbe_functions *func;
418380
struct pch_gbe_mac_info mac;
419381
struct pch_gbe_phy_info phy;
420-
struct pch_gbe_bus_info bus;
421382
};
422383

423384
/**
@@ -680,7 +641,6 @@ void pch_gbe_set_ethtool_ops(struct net_device *netdev);
680641

681642
/* pch_gbe_mac.c */
682643
s32 pch_gbe_mac_force_mac_fc(struct pch_gbe_hw *hw);
683-
s32 pch_gbe_mac_read_mac_addr(struct pch_gbe_hw *hw);
684644
u16 pch_gbe_mac_ctrl_miim(struct pch_gbe_hw *hw, u32 addr, u32 dir, u32 reg,
685645
u16 data);
686646
#endif /* _PCH_GBE_H_ */

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

Lines changed: 0 additions & 262 deletions
This file was deleted.

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

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)