Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / s6gmac.c

diff --git a/drivers/net/ethernet/s6gmac.c b/drivers/net/ethernet/s6gmac.c
index 72fc57dd084d1a6b57a9301a8ae2bc43a3ffd249..b6739afeaca1517bf3351dae9e3a33469cccc46e 100644 (file)
--- a/drivers/net/ethernet/s6gmac.c
+++ b/drivers/net/ethernet/s6gmac.c
@@ -795,7 +795,7 @@ static inline int s6gmac_phy_start(struct net_device *dev)
        struct phy_device *p = NULL;
        while ((i < PHY_MAX_ADDR) && (!(p = pd->mii.bus->phy_map[i])))
                i++;
-       p = phy_connect(dev, dev_name(&p->dev), &s6gmac_adjust_link, 0,
+       p = phy_connect(dev, dev_name(&p->dev), &s6gmac_adjust_link,
                        PHY_INTERFACE_MODE_RGMII);
        if (IS_ERR(p)) {
                printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);
@@ -998,6 +998,7 @@ static int s6gmac_probe(struct platform_device *pdev)
        mb = mdiobus_alloc();
        if (!mb) {
                printk(KERN_ERR DRV_PRMT "error allocating mii bus\n");
+               res = -ENOMEM;
                goto errmii;
        }
        mb->name = "s6gmac_mii";
@@ -1053,20 +1054,7 @@ static struct platform_driver s6gmac_driver = {
        },
 };
 
-static int __init s6gmac_init(void)
-{
-       printk(KERN_INFO DRV_PRMT "S6 GMAC ethernet driver\n");
-       return platform_driver_register(&s6gmac_driver);
-}
-
-
-static void __exit s6gmac_exit(void)
-{
-       platform_driver_unregister(&s6gmac_driver);
-}
-
-module_init(s6gmac_init);
-module_exit(s6gmac_exit);
+module_platform_driver(s6gmac_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("S6105 on chip Ethernet driver");