]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
net: fec: Convert to use devm_ioremap_resource
authorTushar Behera <tushar.behera@linaro.org>
Mon, 10 Jun 2013 11:35:05 +0000 (17:05 +0530)
committerJason Liu <r64343@freescale.com>
Wed, 30 Oct 2013 01:54:20 +0000 (09:54 +0800)
Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()")
introduced devm_ioremap_resource() and deprecated the use of
devm_request_and_ioremap().

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
CC: netdev@vger.kernel.org
CC: "David S. Miller" <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/freescale/fec_main.c

index 212c3308574bbd45bbd1129465e9d6b582e07da2..6e8422c0a12bec4debe1a24118351f434ab8b74f 100644 (file)
@@ -1890,17 +1890,17 @@ fec_probe(struct platform_device *pdev)
                fep->pause_flag |= FEC_PAUSE_FLAG_AUTONEG;
 #endif
 
-       fep->hwp = devm_request_and_ioremap(&pdev->dev, r);
+       fep->hwp = devm_ioremap_resource(&pdev->dev, r);
+       if (IS_ERR(fep->hwp)) {
+               ret = PTR_ERR(fep->hwp);
+               goto failed_ioremap;
+       }
+
        fep->pdev = pdev;
        fep->dev_id = dev_id++;
 
        fep->bufdesc_ex = 0;
 
-       if (!fep->hwp) {
-               ret = -ENOMEM;
-               goto failed_ioremap;
-       }
-
        platform_set_drvdata(pdev, ndev);
 
        ret = of_get_phy_mode(pdev->dev.of_node);