Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20dedd3f authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

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: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 37628606

drivers/staging/et131x/et1310_pm.h

+0 −10
Original line number Original line Diff line number Diff line
@@ -66,15 +66,6 @@ 
#define NUM_WOL_PATTERNS       0x5

#define NUM_WOL_PATTERNS       0x5

#define CRC16_POLY             0x1021

#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 {

typedef struct _MP_POWER_MGMT {

	/* variable putting the phy into coma mode when boot up with no cable

	/* variable putting the phy into coma mode when boot up with no cable

	 * plugged in after 5 seconds

	 * plugged in after 5 seconds
@@ -97,7 +88,6 @@ typedef struct _MP_POWER_MGMT { 
	} IPAddress;

	} IPAddress;





	/* Current Power state of the adapter. */

	/* Current Power state of the adapter. */

	NDIS_DEVICE_POWER_STATE PowerState;

	bool WOLState;

	bool WOLState;

	bool WOLEnabled;

	bool WOLEnabled;

	bool Failed10Half;

	bool Failed10Half;

drivers/staging/et131x/et1310_rx.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1235,13 +1235,11 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *etdev) 
			break;

			break;





		/* Do not receive any packets until a filter has been set.

		/* 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.

		 * Do not receive any packets until we have link.

		 * If length is zero, return the RFD in order to advance the

		 * If length is zero, return the RFD in order to advance the

		 * Free buffer ring.

		 * Free buffer ring.

		 */

		 */

		if ((!etdev->PacketFilter) ||

		if ((!etdev->PacketFilter) ||

		    (etdev->PoMgmt.PowerState != NdisDeviceStateD0) ||

		    (!MP_LINK_DETECTED(etdev)) ||

		    (!MP_LINK_DETECTED(etdev)) ||

		    (pMpRfd->PacketSize == 0)) {

		    (pMpRfd->PacketSize == 0)) {

			continue;

			continue;

drivers/staging/et131x/et131x_initpci.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -967,8 +967,6 @@ int __devinit et131x_pci_setup(struct pci_dev *pdev, 
	DBG_TRACE(et131x_dbginfo, "Init send data structures...\n");

	DBG_TRACE(et131x_dbginfo, "Init send data structures...\n");

	et131x_init_send(adapter);

	et131x_init_send(adapter);





	adapter->PoMgmt.PowerState = NdisDeviceStateD0;



	/* Register the interrupt

	/* Register the interrupt

	 *

	 *

	 * NOTE - This is being done in the open routine, where most other

	 * NOTE - This is being done in the open routine, where most other

drivers/staging/et131x/et131x_isr.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -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);

}
 
}