Skip to content

Commit

Permalink
staging: et131x: Remove redundant struct adapter members
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Einon authored and Greg Kroah-Hartman committed Sep 6, 2011
1 parent 06530d8 commit e296396
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 11 deletions.
6 changes: 0 additions & 6 deletions drivers/staging/et131x/et1310_phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/et131x/et131x_adapter.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
4 changes: 1 addition & 3 deletions drivers/staging/et131x/et131x_initpci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down

0 comments on commit e296396

Please sign in to comment.