stmmac: add init/exit callback in plat_stmmacenet_data struct

This patch adds in the plat_stmmacenet_data
the init and exit callbacks that can be used
for invoking specific platform functions.
For example, on ST targets, these call the
PAD manager functions to set PIO lines and
syscfg registers.
The patch removes the stmmac_claim_resource
only used on STM Kernels as well.

Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 13 insertions, 27 deletions

diff --git a/drivers/net/stmmac/stmmac.h b/drivers/net/stmmac/stmmac.h
index 31575670d862..8ae76501eb74 100644
--- a/drivers/net/stmmac/stmmac.h
+++ b/drivers/net/stmmac/stmmac.h
@@ -87,28 +87,6 @@ struct stmmac_priv {
         struct plat_stmmacenet_data *plat;
 };
 
-#ifdef CONFIG_STM_DRIVERS
-#include <linux/stm/pad.h>
-static inline int stmmac_claim_resource(struct platform_device *pdev)
-{
-        int ret = 0;
-        struct plat_stmmacenet_data *plat_dat = pdev->dev.platform_data;
-
-        /* Pad routing setup */
-        if (IS_ERR(devm_stm_pad_claim(&pdev->dev, plat_dat->pad_config,
-                        dev_name(&pdev->dev)))) {
-                printk(KERN_ERR "%s: Failed to request pads!\n", __func__);
-                ret = -ENODEV;
-        }
-        return ret;
-}
-#else
-static inline int stmmac_claim_resource(struct platform_device *pdev)
-{
-        return 0;
-}
-#endif
-
 extern int stmmac_mdio_unregister(struct net_device *ndev);
 extern int stmmac_mdio_register(struct net_device *ndev);
 extern void stmmac_set_ethtool_ops(struct net_device *netdev);
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index 29ba28660fa9..b806cd3515b4 100644
--- a/drivers/net/stmmac/stmmac_main.c
+++ b/drivers/net/stmmac/stmmac_main.c
@@ -1643,7 +1643,7 @@ static int stmmac_dvr_probe(struct platform_device *pdev)
         struct resource *res;
         void __iomem *addr = NULL;
         struct net_device *ndev = NULL;
-        struct stmmac_priv *priv;
+        struct stmmac_priv *priv = NULL;
         struct plat_stmmacenet_data *plat_dat;
 
         pr_info("STMMAC driver:\n\tplatform registration... ");
@@ -1708,10 +1708,12 @@ static int stmmac_dvr_probe(struct platform_device *pdev)
         /* Set the I/O base addr */
         ndev->base_addr = (unsigned long)addr;
 
-        /* Verify embedded resource for the platform */
-        ret = stmmac_claim_resource(pdev);
-        if (ret < 0)
-                goto out;
+        /* Custom initialisation */
+        if (priv->plat->init) {
+                ret = priv->plat->init(pdev);
+                if (unlikely(ret))
+                        goto out;
+        }
 
         /* MAC HW revice detection */
         ret = stmmac_mac_device_setup(ndev);
@@ -1745,6 +1747,9 @@ static int stmmac_dvr_probe(struct platform_device *pdev)
 
 out:
         if (ret < 0) {
+                if (priv->plat->exit)
+                        priv->plat->exit(pdev);
+
                 platform_set_drvdata(pdev, NULL);
                 release_mem_region(res->start, resource_size(res));
                 if (addr != NULL)
@@ -1778,6 +1783,9 @@ static int stmmac_dvr_remove(struct platform_device *pdev)
 
         stmmac_mdio_unregister(ndev);
 
+        if (priv->plat->exit)
+                priv->plat->exit(pdev);
+
         platform_set_drvdata(pdev, NULL);
         unregister_netdev(ndev);