diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-03-07 14:23:37 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-03-07 14:23:37 +0100 |
commit | ce9cbae133c84c147bc6823f07c0b55bf4012837 (patch) | |
tree | 252d37bb21d8305a59a6d80346d61d24bd42b881 /drivers/net | |
parent | 63557eb99211a4d1e5f722255a2f9fd0a1e7c6ae (diff) | |
parent | aedcb568afe4be0a5dfcc2c02f05efc3915c00f7 (diff) | |
download | barebox-ce9cbae133c84c147bc6823f07c0b55bf4012837.tar.gz barebox-ce9cbae133c84c147bc6823f07c0b55bf4012837.tar.xz |
Merge branch 'for-next/nvme'
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/e1000/main.c | 7 | ||||
-rw-r--r-- | drivers/net/rtl8139.c | 7 | ||||
-rw-r--r-- | drivers/net/rtl8169.c | 7 |
3 files changed, 3 insertions, 18 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); |