diff options
Diffstat (limited to 'drivers/net/ethernet/amd/amd8111e.c')
| -rw-r--r-- | drivers/net/ethernet/amd/amd8111e.c | 19 | 
1 files changed, 4 insertions, 15 deletions
diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c index 8e6b665a6726..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 = {  static int amd8111e_probe_one(struct pci_dev *pdev,  				  const struct pci_device_id *ent)  { -	int err,i,pm_cap; +	int err, i;  	unsigned long reg_addr,reg_len;  	struct amd8111e_priv* lp;  	struct net_device* dev; @@ -1842,7 +1842,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev,  	pci_set_master(pdev);  	/* Find power-management capability. */ -	if((pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM))==0){ +	if (!pdev->pm_cap) {  		printk(KERN_ERR "amd8111e: No Power Management capability, "  		       "exiting.\n");  		err = -ENODEV; @@ -1875,7 +1875,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev,  	lp = netdev_priv(dev);  	lp->pci_dev = pdev;  	lp->amd8111e_net_dev = dev; -	lp->pm_cap = pm_cap; +	lp->pm_cap = pdev->pm_cap;  	spin_lock_init(&lp->lock); @@ -1981,15 +1981,4 @@ static struct pci_driver amd8111e_driver = {  	.resume		= amd8111e_resume  }; -static int __init amd8111e_init(void) -{ -	return pci_register_driver(&amd8111e_driver); -} - -static void __exit amd8111e_cleanup(void) -{ -	pci_unregister_driver(&amd8111e_driver); -} - -module_init(amd8111e_init); -module_exit(amd8111e_cleanup); +module_pci_driver(amd8111e_driver);  | 
