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

Commit d0e027db authored by Auke Kok's avatar Auke Kok
Browse files

e1000: Remove PM warning DPRINTKs breaking 2.4.x kernels 



remove DPRINTKs that were printing warnings about power management on
2.4 kernels.  Since we really don't react differently these printk
statements are not needed.  This code was originally added to fix
some compile time warnings that got fixed by newer kernels.


Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarJohn Ronciak <john.ronciak@intel.com>
parent a145410d

drivers/net/e1000/e1000_main.c

+10 −32
Original line number Diff line number Diff line
@@ -4515,21 +4515,13 @@ e1000_suspend(struct pci_dev *pdev, pm_message_t state) 


		E1000_WRITE_REG(&adapter->hw, WUC, E1000_WUC_PME_EN);

		E1000_WRITE_REG(&adapter->hw, WUFC, wufc);

		retval = pci_enable_wake(pdev, PCI_D3hot, 1);

		if (retval)

			DPRINTK(PROBE, ERR, "Error enabling D3 wake\n");

		retval = pci_enable_wake(pdev, PCI_D3cold, 1);

		if (retval)

			DPRINTK(PROBE, ERR, "Error enabling D3 cold wake\n");

		pci_enable_wake(pdev, PCI_D3hot, 1);

		pci_enable_wake(pdev, PCI_D3cold, 1);

	} else {

		E1000_WRITE_REG(&adapter->hw, WUC, 0);

		E1000_WRITE_REG(&adapter->hw, WUFC, 0);

		retval = pci_enable_wake(pdev, PCI_D3hot, 0);

		if (retval)

			DPRINTK(PROBE, ERR, "Error enabling D3 wake\n");

		retval = pci_enable_wake(pdev, PCI_D3cold, 0);

		if (retval)

			DPRINTK(PROBE, ERR, "Error enabling D3 cold wake\n");

		pci_enable_wake(pdev, PCI_D3hot, 0);

		pci_enable_wake(pdev, PCI_D3cold, 0);

	}



	if (adapter->hw.mac_type >= e1000_82540 &&
@@ -4538,13 +4530,8 @@ e1000_suspend(struct pci_dev *pdev, pm_message_t state) 
		if (manc & E1000_MANC_SMBUS_EN) {

			manc |= E1000_MANC_ARP_EN;

			E1000_WRITE_REG(&adapter->hw, MANC, manc);

			retval = pci_enable_wake(pdev, PCI_D3hot, 1);

			if (retval)

				DPRINTK(PROBE, ERR, "Error enabling D3 wake\n");

			retval = pci_enable_wake(pdev, PCI_D3cold, 1);

			if (retval)

				DPRINTK(PROBE, ERR,

				        "Error enabling D3 cold wake\n");

			pci_enable_wake(pdev, PCI_D3hot, 1);

			pci_enable_wake(pdev, PCI_D3cold, 1);

		}

	}
@@ -4554,9 +4541,7 @@ e1000_suspend(struct pci_dev *pdev, pm_message_t state) 


	pci_disable_device(pdev);



	retval = pci_set_power_state(pdev, pci_choose_state(pdev, state));

	if (retval)

		DPRINTK(PROBE, ERR, "Error in setting power state\n");

	pci_set_power_state(pdev, pci_choose_state(pdev, state));



	return 0;

}
@@ -4567,22 +4552,15 @@ e1000_resume(struct pci_dev *pdev) 
{

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct e1000_adapter *adapter = netdev_priv(netdev);

	int retval;

	uint32_t manc, ret_val;



	retval = pci_set_power_state(pdev, PCI_D0);

	if (retval)

		DPRINTK(PROBE, ERR, "Error in setting power state\n");

	pci_set_power_state(pdev, PCI_D0);

	e1000_pci_restore_state(adapter);

	ret_val = pci_enable_device(pdev);

	pci_set_master(pdev);



	retval = pci_enable_wake(pdev, PCI_D3hot, 0);

	if (retval)

		DPRINTK(PROBE, ERR, "Error enabling D3 wake\n");

	retval = pci_enable_wake(pdev, PCI_D3cold, 0);

	if (retval)

		DPRINTK(PROBE, ERR, "Error enabling D3 cold wake\n");

	pci_enable_wake(pdev, PCI_D3hot, 0);

	pci_enable_wake(pdev, PCI_D3cold, 0);



	e1000_reset(adapter);

	E1000_WRITE_REG(&adapter->hw, WUS, ~0);