diff options
| author | Vladislav Zolotarov <vladz@broadcom.com> | 2010-04-19 03:14:49 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-19 22:17:11 +0200 |
| commit | d3dbfee0d5ee4690824cbc5685bc9fe47a12bb8b (patch) | |
| tree | d4d76caef114b9c4291c3929b41e3552425d84f3 /drivers/net/bnx2x_main.c | |
| parent | bnx2x: use mask in test_registers() to avoid parity error (diff) | |
| download | linux-d3dbfee0d5ee4690824cbc5685bc9fe47a12bb8b.tar.xz linux-d3dbfee0d5ee4690824cbc5685bc9fe47a12bb8b.zip | |
bnx2x: Rework power state handling code
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>
Diffstat (limited to 'drivers/net/bnx2x_main.c')
| -rw-r--r-- | drivers/net/bnx2x_main.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c index d7c00748e270..c4bc006f5104 100644 --- a/drivers/net/bnx2x_main.c +++ b/drivers/net/bnx2x_main.c @@ -11935,6 +11935,14 @@ static int bnx2x_set_power_state(struct bnx2x *bp, pci_power_t state) break; case PCI_D3hot: + /* If there are other clients above don't + shut down the power */ + if (atomic_read(&bp->pdev->enable_cnt) != 1) + return 0; + /* 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; @@ -12551,9 +12559,7 @@ static int bnx2x_close(struct net_device *dev) /* Unload the driver, release IRQs */ bnx2x_nic_unload(bp, UNLOAD_CLOSE); - if (atomic_read(&bp->pdev->enable_cnt) == 1) - if (!CHIP_REV_IS_SLOW(bp)) - bnx2x_set_power_state(bp, PCI_D3hot); + bnx2x_set_power_state(bp, PCI_D3hot); return 0; } |