1 files changed, 13 insertions, 10 deletions

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 8899e105da9f..590e95b4cbfa 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -42,7 +42,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/prefetch.h>
-#include <linux/pci.h>
 #ifdef CONFIG_STMMAC_DEBUG_FS
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
@@ -2093,25 +2092,29 @@ int stmmac_restore(struct net_device *ndev)
 }
 #endif /* CONFIG_PM */
 
+/* Driver can be configured w/ and w/ both PCI and Platf drivers
+ * depending on the configuration selected.
+ */
 static int __init stmmac_init(void)
 {
-        int err = 0;
+        int err_plt = 0;
+        int err_pci = 0;
 
-        err = platform_driver_register(&stmmac_pltfr_driver);
+        err_plt = stmmac_register_platform();
+        err_pci = stmmac_register_pci();
 
-        if (!err) {
-                err = pci_register_driver(&stmmac_pci_driver);
-                if (err)
-                        platform_driver_unregister(&stmmac_pltfr_driver);
+        if ((err_pci) && (err_plt)) {
+                pr_err("stmmac: driver registration failed\n");
+                return -EINVAL;
         }
 
-        return err;
+        return 0;
 }
 
 static void __exit stmmac_exit(void)
 {
-        pci_unregister_driver(&stmmac_pci_driver);
-        platform_driver_unregister(&stmmac_pltfr_driver);
+        stmmac_unregister_platform();
+        stmmac_unregister_pci();
 }
 
 module_init(stmmac_init);