diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-08-03 12:59:38 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-08-03 12:59:38 +0200 |
| commit | d30a0d839a5a282e43353fee53d5dc70db5eceda (patch) | |
| tree | 189a91615be3174a9ff8b20937359d11298433af /drivers/net/ethernet/rdc/r6040.c | |
| parent | fcfb7866af9a5d0280b7e51dd772990c636b7dec (diff) | |
| parent | 988aec3de5f0fa848f26fbf64f9e83364d6b3c25 (diff) | |
Merge branch 'topic/next' into for-next
Diffstat (limited to 'drivers/net/ethernet/rdc/r6040.c')
| -rw-r--r-- | drivers/net/ethernet/rdc/r6040.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c index d1827e887f4..557a26545d7 100644 --- a/drivers/net/ethernet/rdc/r6040.c +++ b/drivers/net/ethernet/rdc/r6040.c @@ -1256,7 +1256,6 @@ static void __devexit r6040_remove_one(struct pci_dev *pdev) kfree(lp->mii_bus->irq); mdiobus_free(lp->mii_bus); netif_napi_del(&lp->napi); - pci_set_drvdata(pdev, NULL); pci_iounmap(pdev, lp->base); pci_release_regions(pdev); free_netdev(dev); @@ -1278,17 +1277,4 @@ static struct pci_driver r6040_driver = { .remove = __devexit_p(r6040_remove_one), }; - -static int __init r6040_init(void) -{ - return pci_register_driver(&r6040_driver); -} - - -static void __exit r6040_cleanup(void) -{ - pci_unregister_driver(&r6040_driver); -} - -module_init(r6040_init); -module_exit(r6040_cleanup); +module_pci_driver(r6040_driver); |