From: Michal Schmidt <mschmidt@redhat.com> Date: Fri, 3 Sep 2010 16:42:47 -0400 Subject: [net] bnx2x: rework power state handling code Message-id: <20100903164247.25415.36368.stgit@brian.englab.brq.redhat.com> Patchwork-id: 28095 O-Subject: [RHEL5.6 BZ572012 PATCH 20/46] bnx2x: Rework power state handling code Bugzilla: 572012 RH-Acked-by: David S. Miller <davem@redhat.com> RH-Acked-by: Stanislaw Gruszka <sgruszka@redhat.com> From: Vladislav Zolotarov <vladz@broadcom.com> Move "don't shut down the power" logic into bnx2x_set_power_state() to make the code cleaner. Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net> (cherry-picked from commit d3dbfee0d5ee4690824cbc5685bc9fe47a12bb8b) diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index 73bf216..4b78302 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c @@ -11963,6 +11963,10 @@ static int bnx2x_set_power_state(struct bnx2x *bp, pci_power_t state) break; case PCI_D3hot: + /* Don't shut down the power for emulation and FPGA */ + if (CHIP_REV_IS_SLOW(bp)) + return 0; + pmcsr &= ~PCI_PM_CTRL_STATE_MASK; pmcsr |= 3; @@ -12597,8 +12601,8 @@ static int bnx2x_close(struct net_device *dev) /* Unload the driver, release IRQs */ bnx2x_nic_unload(bp, UNLOAD_CLOSE); - if (!CHIP_REV_IS_SLOW(bp)) - bnx2x_set_power_state(bp, PCI_D3hot); + bnx2x_set_power_state(bp, PCI_D3hot); + return 0; }