Commit d3dbfee0 authored by Vladislav Zolotarov's avatar Vladislav Zolotarov Committed by David S. Miller
Browse files

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: default avatarVladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8eb5a20c

drivers/net/bnx2x_main.c

+9 −3
Original line number Diff line number Diff line
@@ -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,8 +12559,6 @@ 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);



	return 0;