diff options
| author | Mark Einon <mark.einon@gmail.com> | 2011-09-04 11:24:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 16:54:54 -0700 |
| commit | e2963962aec7e953063c6a1e031a64ca9f5fd47b (patch) | |
| tree | 2cb2ea6f11e997e8528a6d217e56d38650ce5639 | |
| parent | 06530d81d6a6b9cccd6433868fc0bb68fe0361e3 (diff) | |
| download | op-kernel-dev-e2963962aec7e953063c6a1e031a64ca9f5fd47b.zip op-kernel-dev-e2963962aec7e953063c6a1e031a64ca9f5fd47b.tar.gz | |
staging: et131x: Remove redundant struct adapter members
adapter->speed_duplex was never referenced.
adapter->registry_phy_coma was always set to zero, even in the vendor driver.
Removing all member references and associated dead code.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/et131x/et1310_phy.c | 6 | ||||
| -rw-r--r-- | drivers/staging/et131x/et131x_adapter.h | 2 | ||||
| -rw-r--r-- | drivers/staging/et131x/et131x_initpci.c | 4 |
3 files changed, 1 insertions, 11 deletions
diff --git a/drivers/staging/et131x/et1310_phy.c b/drivers/staging/et131x/et1310_phy.c index 41f0afa..0fccb86 100644 --- a/drivers/staging/et131x/et1310_phy.c +++ b/drivers/staging/et131x/et1310_phy.c @@ -496,12 +496,6 @@ void et131x_mii_check(struct et131x_adapter *adapter, /* Setup ET1310 as per the documentation */ et131x_adapter_setup(adapter); - - /* Setup the PHY into coma mode until the cable is - * plugged back in - */ - if (adapter->registry_phy_coma == 1) - et1310_enable_phy_coma(adapter); } } diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h index a63f376..5656472 100644 --- a/drivers/staging/et131x/et131x_adapter.h +++ b/drivers/staging/et131x/et131x_adapter.h @@ -178,9 +178,7 @@ struct et131x_adapter { struct address_map __iomem *regs; /* Registry parameters */ - u8 speed_duplex; /* speed/duplex */ u8 wanted_flow; /* Flow we want for 802.3x flow control */ - u8 registry_phy_coma; /* Phy Coma mode enable/disable */ u32 registry_rx_mem_end; /* Size of internal rx memory */ u32 registry_jumbo_packet; /* Max supported ethernet packet size */ diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c index eb08889..799aad6 100644 --- a/drivers/staging/et131x/et131x_initpci.c +++ b/drivers/staging/et131x/et131x_initpci.c @@ -250,14 +250,12 @@ void et131x_error_timer_handler(unsigned long data) "No interrupts, in PHY coma, pm_csr = 0x%x\n", pm_csr); if (!(adapter->bmsr & BMSR_LSTATUS) && - adapter->registry_phy_coma && adapter->boot_coma < 11) { adapter->boot_coma++; } if (adapter->boot_coma == 10) { - if (!(adapter->bmsr & BMSR_LSTATUS) - && adapter->registry_phy_coma) { + if (!(adapter->bmsr & BMSR_LSTATUS)) { if ((pm_csr & ET_PM_PHY_SW_COMA) == 0) { /* NOTE - This was originally a 'sync with * interrupt'. How to do that under Linux? |
