]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: mv643xx: use devm_platform_ioremap_resource
authorRosen Penev <rosenp@gmail.com>
Mon, 30 Sep 2024 20:29:50 +0000 (13:29 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 4 Oct 2024 15:59:47 +0000 (08:59 -0700)
This combines multiple steps in one function.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20240930202951.297737-2-rosenp@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/marvell/mv643xx_eth.c

index 9e80899546d9962119fc62dbad6454ff31bd61ff..3036ac9f042a414b2a5b977b002490e4ed090f9d 100644 (file)
@@ -2843,25 +2843,20 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
        struct mv643xx_eth_shared_platform_data *pd;
        struct mv643xx_eth_shared_private *msp;
        const struct mbus_dram_target_info *dram;
-       struct resource *res;
        int ret;
 
        if (!mv643xx_eth_version_printed++)
                pr_notice("MV-643xx 10/100/1000 ethernet driver version %s\n",
                          mv643xx_eth_driver_version);
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (res == NULL)
-               return -EINVAL;
-
        msp = devm_kzalloc(&pdev->dev, sizeof(*msp), GFP_KERNEL);
        if (msp == NULL)
                return -ENOMEM;
        platform_set_drvdata(pdev, msp);
 
-       msp->base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
-       if (msp->base == NULL)
-               return -ENOMEM;
+       msp->base = devm_platform_ioremap_resource(pdev, 0);
+       if (IS_ERR(msp->base))
+               return PTR_ERR(msp->base);
 
        msp->clk = devm_clk_get(&pdev->dev, NULL);
        if (!IS_ERR(msp->clk))