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>

diff --git a/drivers/staging/et131x/et1310_phy.c b/drivers/staging/et131x/et1310_phy.c
index 41f0afa4a13c5260e81c91b5655dd300704c4107..0fccb86810c0ce1dffdc13ea7f723992293fccf6 100644 (file)
--- 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 a63f3768daa1ec084447c9bc3b378f7c9c6382a5..5656472c9d3cb2dbe31521157a648387dc809a09 100644 (file)
--- 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 eb08889e20b0783a37b66bacb336ba0c25a5e763..799aad6854797bae8bfb8352a929c8c44cac88fe 100644 (file)
--- 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?