diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2006-07-21 14:51:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-07-21 14:51:02 -0700 |
| commit | a0ee7c70b22f78593957f99faa06acb4747b8bc0 (patch) | |
| tree | 5fdc034ab3aee7bcc67ef820a9f69d5e0eb9b8dd /drivers | |
| parent | 485fb2c998a37d5c3c6aa082aa451e66db90f34a (diff) | |
| download | blackbird-op-linux-a0ee7c70b22f78593957f99faa06acb4747b8bc0.tar.gz blackbird-op-linux-a0ee7c70b22f78593957f99faa06acb4747b8bc0.zip | |
[NET]: sun happymeal, little pci cleanup
Use pci_register_driver instead of pci_module_init. Use PCI_DEVICE macro.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/sunhme.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index 8673fd4c08c7..c6f5bc3c042f 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c @@ -3255,12 +3255,7 @@ static void __devexit happy_meal_pci_remove(struct pci_dev *pdev) } static struct pci_device_id happymeal_pci_ids[] = { - { - .vendor = PCI_VENDOR_ID_SUN, - .device = PCI_DEVICE_ID_SUN_HAPPYMEAL, - .subvendor = PCI_ANY_ID, - .subdevice = PCI_ANY_ID, - }, + { PCI_DEVICE(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_HAPPYMEAL) }, { } /* Terminating entry */ }; @@ -3275,7 +3270,7 @@ static struct pci_driver hme_pci_driver = { static int __init happy_meal_pci_init(void) { - return pci_module_init(&hme_pci_driver); + return pci_register_driver(&hme_pci_driver); } static void happy_meal_pci_exit(void) |
