diff options
author | Jon Mason <jdmason@kudzu.us> | 2013-09-11 14:22:40 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-09-13 20:13:00 -0400 |
commit | 0319f30ee7e11b253067d8a621e410bcf0e0442b (patch) | |
tree | 674a14f2fbb390d1867fa363f5e63f6982074fa3 /drivers/net/ethernet/broadcom/tg3.c | |
parent | 29ed74c35088a775807743a5c84eecf6efa85d9f (diff) |
tg3: Use pci_dev pm_cap
Use the already existing pm_cap variable in struct pci_dev for
determining the power management offset. This saves the driver from
having to keep track of an extra variable.
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Cc: Nithin Nayak Sujir <nsujir@broadcom.com>
Cc: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/tg3.c')
-rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 9011ea0f5207..12d961c4ebca 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c | |||
@@ -16193,12 +16193,12 @@ static int tg3_get_invariants(struct tg3 *tp, const struct pci_device_id *ent) | |||
16193 | * So explicitly force the chip into D0 here. | 16193 | * So explicitly force the chip into D0 here. |
16194 | */ | 16194 | */ |
16195 | pci_read_config_dword(tp->pdev, | 16195 | pci_read_config_dword(tp->pdev, |
16196 | tp->pm_cap + PCI_PM_CTRL, | 16196 | tp->pdev->pm_cap + PCI_PM_CTRL, |
16197 | &pm_reg); | 16197 | &pm_reg); |
16198 | pm_reg &= ~PCI_PM_CTRL_STATE_MASK; | 16198 | pm_reg &= ~PCI_PM_CTRL_STATE_MASK; |
16199 | pm_reg |= PCI_PM_CTRL_PME_ENABLE | 0 /* D0 */; | 16199 | pm_reg |= PCI_PM_CTRL_PME_ENABLE | 0 /* D0 */; |
16200 | pci_write_config_dword(tp->pdev, | 16200 | pci_write_config_dword(tp->pdev, |
16201 | tp->pm_cap + PCI_PM_CTRL, | 16201 | tp->pdev->pm_cap + PCI_PM_CTRL, |
16202 | pm_reg); | 16202 | pm_reg); |
16203 | 16203 | ||
16204 | /* Also, force SERR#/PERR# in PCI command. */ | 16204 | /* Also, force SERR#/PERR# in PCI command. */ |
@@ -17347,7 +17347,6 @@ static int tg3_init_one(struct pci_dev *pdev, | |||
17347 | tp = netdev_priv(dev); | 17347 | tp = netdev_priv(dev); |
17348 | tp->pdev = pdev; | 17348 | tp->pdev = pdev; |
17349 | tp->dev = dev; | 17349 | tp->dev = dev; |
17350 | tp->pm_cap = pdev->pm_cap; | ||
17351 | tp->rx_mode = TG3_DEF_RX_MODE; | 17350 | tp->rx_mode = TG3_DEF_RX_MODE; |
17352 | tp->tx_mode = TG3_DEF_TX_MODE; | 17351 | tp->tx_mode = TG3_DEF_TX_MODE; |
17353 | tp->irq_sync = 1; | 17352 | tp->irq_sync = 1; |