diff options
author | Yijing Wang <wangyijing@huawei.com> | 2013-06-18 04:06:37 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-06-20 01:22:56 -0400 |
commit | f9c7da5eaf10fa1d7a91b83aefc6fb8e3a4ad39c (patch) | |
tree | 201dcfe2f2a6b0bc2b7a194ec35c6c6a21ffe204 | |
parent | b8a39dd292af453f42ebcdbad229f7d9d1282ec2 (diff) |
amd8111e: use pdev->pm_cap instead of pci_find_capability(.., PCI_CAP_ID_PM)
Pci core has been saved pm cap register offset by pdev->pm_cap in pci_pm_init()
in init path. So we can use pdev->pm_cap instead of using
pci_find_capability(pdev, PCI_CAP_ID_PM) for better performance and simplified code.
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Patrick McHardy <kaber@trash.net>
Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: netdev@vger.kernel.org (open list:NETWORKING DRIVERS)
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/amd/amd8111e.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c index bc71aec1159d..1b1429d5d5c2 100644 --- a/drivers/net/ethernet/amd/amd8111e.c +++ b/drivers/net/ethernet/amd/amd8111e.c | |||
@@ -1813,7 +1813,7 @@ static const struct net_device_ops amd8111e_netdev_ops = { | |||
1813 | static int amd8111e_probe_one(struct pci_dev *pdev, | 1813 | static int amd8111e_probe_one(struct pci_dev *pdev, |
1814 | const struct pci_device_id *ent) | 1814 | const struct pci_device_id *ent) |
1815 | { | 1815 | { |
1816 | int err,i,pm_cap; | 1816 | int err, i; |
1817 | unsigned long reg_addr,reg_len; | 1817 | unsigned long reg_addr,reg_len; |
1818 | struct amd8111e_priv* lp; | 1818 | struct amd8111e_priv* lp; |
1819 | struct net_device* dev; | 1819 | struct net_device* dev; |
@@ -1842,7 +1842,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev, | |||
1842 | pci_set_master(pdev); | 1842 | pci_set_master(pdev); |
1843 | 1843 | ||
1844 | /* Find power-management capability. */ | 1844 | /* Find power-management capability. */ |
1845 | if((pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM))==0){ | 1845 | if (!pdev->pm_cap) { |
1846 | printk(KERN_ERR "amd8111e: No Power Management capability, " | 1846 | printk(KERN_ERR "amd8111e: No Power Management capability, " |
1847 | "exiting.\n"); | 1847 | "exiting.\n"); |
1848 | err = -ENODEV; | 1848 | err = -ENODEV; |
@@ -1875,7 +1875,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev, | |||
1875 | lp = netdev_priv(dev); | 1875 | lp = netdev_priv(dev); |
1876 | lp->pci_dev = pdev; | 1876 | lp->pci_dev = pdev; |
1877 | lp->amd8111e_net_dev = dev; | 1877 | lp->amd8111e_net_dev = dev; |
1878 | lp->pm_cap = pm_cap; | 1878 | lp->pm_cap = pdev->pm_cap; |
1879 | 1879 | ||
1880 | spin_lock_init(&lp->lock); | 1880 | spin_lock_init(&lp->lock); |
1881 | 1881 | ||