diff options
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 5 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.h | 1 |
2 files changed, 2 insertions, 4 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; |
diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h index ddb8be1298ea..70257808aa37 100644 --- a/drivers/net/ethernet/broadcom/tg3.h +++ b/drivers/net/ethernet/broadcom/tg3.h | |||
| @@ -3234,7 +3234,6 @@ struct tg3 { | |||
| 3234 | u8 pci_lat_timer; | 3234 | u8 pci_lat_timer; |
| 3235 | 3235 | ||
| 3236 | int pci_fn; | 3236 | int pci_fn; |
| 3237 | int pm_cap; | ||
| 3238 | int msi_cap; | 3237 | int msi_cap; |
| 3239 | int pcix_cap; | 3238 | int pcix_cap; |
| 3240 | int pcie_readrq; | 3239 | int pcie_readrq; |
