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

Commit b8a39dd2 authored by Yijing Wang's avatar Yijing Wang Committed by David S. Miller
Browse files

Bnx2x: remove redundant D0 power state set 



Pci_enable_device() will set device power state to D0,
so it's no need to do it again in bnx2x_init_dev().
Also remove redundant PM Cap find code, because pci core
has been saved the pci device pm cap value.

Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Cc: Eilon Greenstein <eilong@broadcom.com>
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Acked-by: default avatarYuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2206209e

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -12091,7 +12091,7 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev, 
	}

	}





	if (IS_PF(bp)) {

	if (IS_PF(bp)) {

		bp->pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);

		bp->pm_cap = pdev->pm_cap;

		if (bp->pm_cap == 0) {

		if (bp->pm_cap == 0) {

			dev_err(&bp->pdev->dev,

			dev_err(&bp->pdev->dev,

				"Cannot find power management capability, aborting\n");

				"Cannot find power management capability, aborting\n");
@@ -12140,8 +12140,6 @@ static int bnx2x_init_dev(struct bnx2x *bp, struct pci_dev *pdev, 
	}

	}

	BNX2X_DEV_INFO("me reg PF num: %d\n", bp->pf_num);

	BNX2X_DEV_INFO("me reg PF num: %d\n", bp->pf_num);





	bnx2x_set_power_state(bp, PCI_D0);



	/* clean indirect addresses */

	/* clean indirect addresses */

	pci_write_config_dword(bp->pdev, PCICFG_GRC_ADDRESS,

	pci_write_config_dword(bp->pdev, PCICFG_GRC_ADDRESS,

			       PCICFG_VENDOR_ID_OFFSET);

			       PCICFG_VENDOR_ID_OFFSET);