diff options
| author | Alan Cox <alan@linux.intel.com> | 2009-08-19 19:21:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 21:02:26 +0200 |
| commit | 20dedd3faa8785937df45e8518f3930be7110d96 (patch) | |
| tree | 792e761e9cfb7606ca99734e9ab855509b6273b0 | |
| parent | Staging: et131x: spinlocks (diff) | |
| download | linux-20dedd3faa8785937df45e8518f3930be7110d96.tar.xz linux-20dedd3faa8785937df45e8518f3930be7110d96.zip | |
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>
| -rw-r--r-- | drivers/staging/et131x/et1310_pm.h | 10 | ||||
| -rw-r--r-- | drivers/staging/et131x/et1310_rx.c | 2 | ||||
| -rw-r--r-- | drivers/staging/et131x/et131x_initpci.c | 2 | ||||
| -rw-r--r-- | drivers/staging/et131x/et131x_isr.c | 3 |
4 files changed, 1 insertions, 16 deletions
diff --git a/drivers/staging/et131x/et1310_pm.h b/drivers/staging/et131x/et1310_pm.h index dca9977f59a2..8e06039537e0 100644 --- 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 9dc08fb4bf27..b05b8c50d072 100644 --- 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 b9018e6f5660..d84b6546160f 100644 --- 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 9f51425512c5..f9687b344159 100644 --- 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); } |