net: qcom/emac: do not use devm on internal phy pdev

The platform_device returned by of_find_device_by_node() is not
automatically released when the driver unprobes.  Therefore,
managed calls like devm_ioremap_resource() should not be used.
Instead, we manually allocate the resources and then free them
on driver release.

Signed-off-by: Timur Tabi <timur@codeaurora.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/qualcomm/emac/emac-sgmii.c b/drivers/net/ethernet/qualcomm/emac/emac-sgmii.c
index 6ab0a3c96431f0d3ee57b409794e5b7d622c1104..ad0e4209d9481ad447eb7cdf18e32b4bec7c577f 100644 (file)
--- a/drivers/net/ethernet/qualcomm/emac/emac-sgmii.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac-sgmii.c
@@ -681,6 +681,7 @@ int emac_sgmii_config(struct platform_device *pdev, struct emac_adapter *adpt)
        struct resource *res;
        const struct of_device_id *match;
        struct device_node *np;
+       int ret;
 
        np = of_parse_phandle(pdev->dev.of_node, "internal-phy", 0);
        if (!np) {
@@ -697,25 +698,48 @@ int emac_sgmii_config(struct platform_device *pdev, struct emac_adapter *adpt)
        match = of_match_device(emac_sgmii_dt_match, &sgmii_pdev->dev);
        if (!match) {
                dev_err(&pdev->dev, "unrecognized internal phy node\n");
-               return -ENODEV;
+               ret = -ENODEV;
+               goto error_put_device;
        }
 
        phy->initialize = (emac_sgmii_initialize)match->data;
 
        /* Base address is the first address */
        res = platform_get_resource(sgmii_pdev, IORESOURCE_MEM, 0);
-       phy->base = devm_ioremap_resource(&sgmii_pdev->dev, res);
-       if (IS_ERR(phy->base))
-               return PTR_ERR(phy->base);
+       phy->base = ioremap(res->start, resource_size(res));
+       if (IS_ERR(phy->base)) {
+               ret = PTR_ERR(phy->base);
+               goto error_put_device;
+       }
 
        /* v2 SGMII has a per-lane digital digital, so parse it if it exists */
        res = platform_get_resource(sgmii_pdev, IORESOURCE_MEM, 1);
        if (res) {
-               phy->digital = devm_ioremap_resource(&sgmii_pdev->dev, res);
-               if (IS_ERR(phy->base))
-                       return PTR_ERR(phy->base);
-
+               phy->digital = ioremap(res->start, resource_size(res));
+               if (IS_ERR(phy->digital)) {
+                       ret = PTR_ERR(phy->digital);
+                       goto error_unmap_base;
+               }
        }
 
-       return phy->initialize(adpt);
+       ret = phy->initialize(adpt);
+       if (ret)
+               goto error;
+
+       /* We've remapped the addresses, so we don't need the device any
+        * more.  of_find_device_by_node() says we should release it.
+        */
+       put_device(&sgmii_pdev->dev);
+
+       return 0;
+
+error:
+       if (phy->digital)
+               iounmap(phy->digital);
+error_unmap_base:
+       iounmap(phy->base);
+error_put_device:
+       put_device(&sgmii_pdev->dev);
+
+       return ret;
 }

diff --git a/drivers/net/ethernet/qualcomm/emac/emac.c b/drivers/net/ethernet/qualcomm/emac/emac.c
index e47d38701d6c995a8d0d20edb0a73cbe1d286f9a..429b4cb59ac4c294ae2fcf066b432a8ab13e9aef 100644 (file)
--- a/drivers/net/ethernet/qualcomm/emac/emac.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac.c
@@ -723,6 +723,10 @@ static int emac_remove(struct platform_device *pdev)
        mdiobus_unregister(adpt->mii_bus);
        free_netdev(netdev);
 
+       if (adpt->phy.digital)
+               iounmap(adpt->phy.digital);
+       iounmap(adpt->phy.base);
+
        return 0;
 }