stmmac: clean up platform/of_match data retrieval

Refactor code to clearly separate probing non-dt versus dt. In the
non-dt case platform data must be supplied to probe successfully.
For dt the platform data structure is created and match data is
copied into it. Note that support for supplying platform data in
dt from AUXDATA is dropped as no users in mainline does this.

This change will allow dt dwmac-* drivers to call the config_dt()
function from probe to create the needed platform data struct and
retrieve common dt properties.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 89e40ddc0391823399d33b1d9c84dcc47c8c1a6e..6e6ef859f58ad86f3c5a29e600750f2418ccfb68 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -105,13 +105,20 @@ static int dwmac1000_validate_ucast_entries(int ucast_entries)
  * set some private fields that will be used by the main at runtime.
  */
 static int stmmac_probe_config_dt(struct platform_device *pdev,
-                                 struct plat_stmmacenet_data *plat,
+                                 struct plat_stmmacenet_data **plat_dat,
                                  const char **mac)
 {
        struct device_node *np = pdev->dev.of_node;
+       struct plat_stmmacenet_data *plat;
        const struct stmmac_of_data *data;
        struct stmmac_dma_cfg *dma_cfg;
 
+       plat = devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL);
+       if (!plat)
+               return -ENOMEM;
+
+       *plat_dat = plat;
+
        data = of_device_get_match_data(&pdev->dev);
        if (data) {
                plat->has_gmac = data->has_gmac;
@@ -180,6 +187,12 @@ static int stmmac_probe_config_dt(struct platform_device *pdev,
         */
        plat->maxmtu = JUMBO_LEN;
 
+       /* Set default value for multicast hash bins */
+       plat->multicast_filter_bins = HASH_TABLE_SIZE;
+
+       /* Set default value for unicast filter entries */
+       plat->unicast_filter_entries = 1;
+
        /*
         * Currently only the properties needed on SPEAr600
         * are provided. All other properties should be added
@@ -242,7 +255,7 @@ static int stmmac_probe_config_dt(struct platform_device *pdev,
 }
 #else
 static int stmmac_probe_config_dt(struct platform_device *pdev,
-                                 struct plat_stmmacenet_data *plat,
+                                 struct plat_stmmacenet_data **plat,
                                  const char **mac)
 {
        return -ENOSYS;
@@ -301,29 +314,24 @@ int stmmac_pltfr_probe(struct platform_device *pdev)
        if (IS_ERR(stmmac_res.addr))
                return PTR_ERR(stmmac_res.addr);
 
-       plat_dat = dev_get_platdata(&pdev->dev);
-
-       if (!plat_dat)
-               plat_dat = devm_kzalloc(&pdev->dev,
-                                       sizeof(struct plat_stmmacenet_data),
-                                       GFP_KERNEL);
-       if (!plat_dat) {
-               pr_err("%s: ERROR: no memory", __func__);
-               return  -ENOMEM;
-       }
-
-       /* Set default value for multicast hash bins */
-       plat_dat->multicast_filter_bins = HASH_TABLE_SIZE;
-
-       /* Set default value for unicast filter entries */
-       plat_dat->unicast_filter_entries = 1;
-
        if (pdev->dev.of_node) {
-               ret = stmmac_probe_config_dt(pdev, plat_dat, &stmmac_res.mac);
+               ret = stmmac_probe_config_dt(pdev, &plat_dat, &stmmac_res.mac);
                if (ret) {
-                       pr_err("%s: main dt probe failed", __func__);
+                       dev_err(&pdev->dev, "dt configuration failed\n");
                        return ret;
                }
+       } else {
+               plat_dat = dev_get_platdata(&pdev->dev);
+               if (!plat_dat) {
+                       dev_err(&pdev->dev, "no platform data provided\n");
+                       return  -EINVAL;
+               }
+
+               /* Set default value for multicast hash bins */
+               plat_dat->multicast_filter_bins = HASH_TABLE_SIZE;
+
+               /* Set default value for unicast filter entries */
+               plat_dat->unicast_filter_entries = 1;
        }
 
        /* Custom setup (if needed) */