Staging: et131x: power state

This is assigned once to ndis d0, and then never changes so it is a constant
and we can zap it

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/et131x/et1310_pm.h b/drivers/staging/et131x/et1310_pm.h
index dca9977f59a2eb4c135598f20d165a81ba5055dc..8e06039537e0ea50385ff9f216a15e9c8641e72c 100644 (file)
--- a/drivers/staging/et131x/et1310_pm.h
+++ b/drivers/staging/et131x/et1310_pm.h
@@ -66,15 +66,6 @@
 #define NUM_WOL_PATTERNS       0x5
 #define CRC16_POLY             0x1021
 
-/* Definition of NDIS_DEVICE_POWER_STATE */
-typedef enum {
-       NdisDeviceStateUnspecified = 0,
-       NdisDeviceStateD0,
-       NdisDeviceStateD1,
-       NdisDeviceStateD2,
-       NdisDeviceStateD3
-} NDIS_DEVICE_POWER_STATE;
-
 typedef struct _MP_POWER_MGMT {
        /* variable putting the phy into coma mode when boot up with no cable
         * plugged in after 5 seconds
@@ -97,7 +88,6 @@ typedef struct _MP_POWER_MGMT {
        } IPAddress;
 
        /* Current Power state of the adapter. */
-       NDIS_DEVICE_POWER_STATE PowerState;
        bool WOLState;
        bool WOLEnabled;
        bool Failed10Half;

diff --git a/drivers/staging/et131x/et1310_rx.c b/drivers/staging/et131x/et1310_rx.c
index 9dc08fb4bf27c88b0a4171afb50669a29f5de18e..b05b8c50d0722f03d6ed057f1b34d518fae09fcb 100644 (file)
--- a/drivers/staging/et131x/et1310_rx.c
+++ b/drivers/staging/et131x/et1310_rx.c
@@ -1235,13 +1235,11 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *etdev)
                        break;
 
                /* Do not receive any packets until a filter has been set.
-                * Do not receive any packets until we are at D0.
                 * Do not receive any packets until we have link.
                 * If length is zero, return the RFD in order to advance the
                 * Free buffer ring.
                 */
                if ((!etdev->PacketFilter) ||
-                   (etdev->PoMgmt.PowerState != NdisDeviceStateD0) ||
                    (!MP_LINK_DETECTED(etdev)) ||
                    (pMpRfd->PacketSize == 0)) {
                        continue;

diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c
index b9018e6f5660a59922894389d8139aa6d0dd3aba..d84b6546160f1dd9931d9a36675ab4c039f7a678 100644 (file)
--- a/drivers/staging/et131x/et131x_initpci.c
+++ b/drivers/staging/et131x/et131x_initpci.c
@@ -967,8 +967,6 @@ int __devinit et131x_pci_setup(struct pci_dev *pdev,
        DBG_TRACE(et131x_dbginfo, "Init send data structures...\n");
        et131x_init_send(adapter);
 
-       adapter->PoMgmt.PowerState = NdisDeviceStateD0;
-
        /* Register the interrupt
         *
         * NOTE - This is being done in the open routine, where most other

diff --git a/drivers/staging/et131x/et131x_isr.c b/drivers/staging/et131x/et131x_isr.c
index 9f51425512c5db3a34e9dbbb701a474d166f3da9..f9687b344159beac99ca3bee6f450abd921a0454 100644 (file)
--- a/drivers/staging/et131x/et131x_isr.c
+++ b/drivers/staging/et131x/et131x_isr.c
@@ -479,6 +479,5 @@ void et131x_isr_handler(struct work_struct *work)
                }
        }
 
-       if (etdev->PoMgmt.PowerState == NdisDeviceStateD0)
-               et131x_enable_interrupts(etdev);
+       et131x_enable_interrupts(etdev);
 }