From 19f3609c086da24550e8154160b6628e4f1644d2 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Wed, 7 Nov 2012 02:54:30 +0000 Subject: [PATCH] --- yaml --- r: 340692 b: refs/heads/master c: 85894866bcc396162906c0b95c0eadd00c13efbd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/micrel/ksz884x.c | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index c628404fc8c8..eeef795fa9ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55c11941e382cb26010138ab824216f47af37606 +refs/heads/master: 85894866bcc396162906c0b95c0eadd00c13efbd diff --git a/trunk/drivers/net/ethernet/micrel/ksz884x.c b/trunk/drivers/net/ethernet/micrel/ksz884x.c index 318fee91c79d..658afc45f378 100644 --- a/trunk/drivers/net/ethernet/micrel/ksz884x.c +++ b/trunk/drivers/net/ethernet/micrel/ksz884x.c @@ -7251,18 +7251,7 @@ static struct pci_driver pci_device_driver = { .remove = pcidev_exit }; -static int __init ksz884x_init_module(void) -{ - return pci_register_driver(&pci_device_driver); -} - -static void __exit ksz884x_cleanup_module(void) -{ - pci_unregister_driver(&pci_device_driver); -} - -module_init(ksz884x_init_module); -module_exit(ksz884x_cleanup_module); +module_pci_driver(pci_device_driver); MODULE_DESCRIPTION("KSZ8841/2 PCI network driver"); MODULE_AUTHOR("Tristram Ha ");