提交 0319f30e 编写于 作者: J Jon Mason 提交者: David S. Miller

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: NJon Mason <jdmason@kudzu.us>
Cc: Nithin Nayak Sujir <nsujir@broadcom.com>
Cc: Michael Chan <mchan@broadcom.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 29ed74c3
...@@ -16193,12 +16193,12 @@ static int tg3_get_invariants(struct tg3 *tp, const struct pci_device_id *ent) ...@@ -16193,12 +16193,12 @@ static int tg3_get_invariants(struct tg3 *tp, const struct pci_device_id *ent)
* So explicitly force the chip into D0 here. * So explicitly force the chip into D0 here.
*/ */
pci_read_config_dword(tp->pdev, pci_read_config_dword(tp->pdev,
tp->pm_cap + PCI_PM_CTRL, tp->pdev->pm_cap + PCI_PM_CTRL,
&pm_reg); &pm_reg);
pm_reg &= ~PCI_PM_CTRL_STATE_MASK; pm_reg &= ~PCI_PM_CTRL_STATE_MASK;
pm_reg |= PCI_PM_CTRL_PME_ENABLE | 0 /* D0 */; pm_reg |= PCI_PM_CTRL_PME_ENABLE | 0 /* D0 */;
pci_write_config_dword(tp->pdev, pci_write_config_dword(tp->pdev,
tp->pm_cap + PCI_PM_CTRL, tp->pdev->pm_cap + PCI_PM_CTRL,
pm_reg); pm_reg);
/* Also, force SERR#/PERR# in PCI command. */ /* Also, force SERR#/PERR# in PCI command. */
...@@ -17347,7 +17347,6 @@ static int tg3_init_one(struct pci_dev *pdev, ...@@ -17347,7 +17347,6 @@ static int tg3_init_one(struct pci_dev *pdev,
tp = netdev_priv(dev); tp = netdev_priv(dev);
tp->pdev = pdev; tp->pdev = pdev;
tp->dev = dev; tp->dev = dev;
tp->pm_cap = pdev->pm_cap;
tp->rx_mode = TG3_DEF_RX_MODE; tp->rx_mode = TG3_DEF_RX_MODE;
tp->tx_mode = TG3_DEF_TX_MODE; tp->tx_mode = TG3_DEF_TX_MODE;
tp->irq_sync = 1; tp->irq_sync = 1;
......
...@@ -3234,7 +3234,6 @@ struct tg3 { ...@@ -3234,7 +3234,6 @@ struct tg3 {
u8 pci_lat_timer; u8 pci_lat_timer;
int pci_fn; int pci_fn;
int pm_cap;
int msi_cap; int msi_cap;
int pcix_cap; int pcix_cap;
int pcie_readrq; int pcie_readrq;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册