From b6f6b7853a23d860eebc3b28d7cbeb853b953236 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Mon, 11 Feb 2019 22:40:17 -0800 Subject: drivers: Make use of device_pci_driver() Replace all of the generic PCI boilerplate with device_pci_driver(). Signed-off-by: Andrey Smirnov Signed-off-by: Sascha Hauer --- drivers/net/e1000/main.c | 7 +------ drivers/net/rtl8139.c | 7 +------ drivers/net/rtl8169.c | 7 +------ drivers/usb/host/xhci-pci.c | 7 +------ 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/drivers/net/e1000/main.c b/drivers/net/e1000/main.c index 774e3d030f..f67c5d867b 100644 --- a/drivers/net/e1000/main.c +++ b/drivers/net/e1000/main.c @@ -3713,9 +3713,4 @@ static struct pci_driver e1000_eth_driver = { .probe = e1000_probe, .remove = e1000_remove, }; - -static int e1000_driver_init(void) -{ - return pci_register_driver(&e1000_eth_driver); -} -device_initcall(e1000_driver_init); +device_pci_driver(e1000_eth_driver); diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c index cfa34a2f2a..e1c57e6b7c 100644 --- a/drivers/net/rtl8139.c +++ b/drivers/net/rtl8139.c @@ -594,9 +594,4 @@ static struct pci_driver rtl8139_eth_driver = { .id_table = rtl8139_pci_tbl, .probe = rtl8139_probe, }; - -static int rtl8139_init(void) -{ - return pci_register_driver(&rtl8139_eth_driver); -} -device_initcall(rtl8139_init); +device_pci_driver(rtl8139_eth_driver); diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c index ba257509ee..4e9823d424 100644 --- a/drivers/net/rtl8169.c +++ b/drivers/net/rtl8169.c @@ -544,9 +544,4 @@ static struct pci_driver rtl8169_eth_driver = { .id_table = rtl8169_pci_tbl, .probe = rtl8169_probe, }; - -static int rtl8169_init(void) -{ - return pci_register_driver(&rtl8169_eth_driver); -} -device_initcall(rtl8169_init); +device_pci_driver(rtl8169_eth_driver); diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index a140b1dd07..7a9315a0b6 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -37,9 +37,4 @@ static struct pci_driver xhci_pci_driver = { .id_table = xhci_pci_tbl, .probe = xhci_pci_probe, }; - -static int xhci_pci_init(void) -{ - return pci_register_driver(&xhci_pci_driver); -} -device_initcall(xhci_pci_init); +device_pci_driver(xhci_pci_driver); -- cgit v1.2.3