From alan@linux.intel.com Thu Aug 20 14:39:15 2009 From: Alan Cox Date: Wed, 19 Aug 2009 18:21:56 +0100 Subject: Staging: et131x: power state To: greg@kroah.com, linux-kernel@vger.kernel.org Message-ID: <20090819172156.21152.18437.stgit@localhost.localdomain> 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/et131x/et1310_pm.h | 10 ---------- drivers/staging/et131x/et1310_rx.c | 2 -- drivers/staging/et131x/et131x_initpci.c | 2 -- drivers/staging/et131x/et131x_isr.c | 3 +-- 4 files changed, 1 insertion(+), 16 deletions(-) --- 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; --- a/drivers/staging/et131x/et1310_rx.c +++ b/drivers/staging/et131x/et1310_rx.c @@ -1235,13 +1235,11 @@ void et131x_handle_recv_interrupt(struct 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; --- a/drivers/staging/et131x/et131x_initpci.c +++ b/drivers/staging/et131x/et131x_initpci.c @@ -967,8 +967,6 @@ int __devinit et131x_pci_setup(struct pc 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 --- a/drivers/staging/et131x/et131x_isr.c +++ b/drivers/staging/et131x/et131x_isr.c @@ -479,6 +479,5 @@ void et131x_isr_handler(struct work_stru } } - if (etdev->PoMgmt.PowerState == NdisDeviceStateD0) - et131x_enable_interrupts(etdev); + et131x_enable_interrupts(etdev); }