]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mtd: rawnand: intel: Use devm_platform_ioremap_resource_byname()
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Sat, 2 Jul 2022 23:12:27 +0000 (01:12 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 3 Nov 2022 15:00:28 +0000 (00:00 +0900)
[ Upstream commit 7471a53ddce54cee9b7a340dc930eb35b02c9eed ]

Switch from open-coded platform_get_resource_byname() and
devm_ioremap_resource() to devm_platform_ioremap_resource_byname() where
possible to simplify the code.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20220702231227.1579176-9-martin.blumenstingl@googlemail.com
Stable-dep-of: 1f3b494d1fc1 ("mtd: rawnand: intel: Add missing of_node_put() in ebu_nand_probe()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/mtd/nand/raw/intel-nand-controller.c

index 8c78a05099bfb729011b87463e061817648603c6..bd821e4353292736c14231cd3f4c832a675c8c52 100644 (file)
@@ -595,13 +595,11 @@ static int ebu_nand_probe(struct platform_device *pdev)
        ebu_host->dev = dev;
        nand_controller_init(&ebu_host->controller);
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ebunand");
-       ebu_host->ebu = devm_ioremap_resource(&pdev->dev, res);
+       ebu_host->ebu = devm_platform_ioremap_resource_byname(pdev, "ebunand");
        if (IS_ERR(ebu_host->ebu))
                return PTR_ERR(ebu_host->ebu);
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hsnand");
-       ebu_host->hsnand = devm_ioremap_resource(&pdev->dev, res);
+       ebu_host->hsnand = devm_platform_ioremap_resource_byname(pdev, "hsnand");
        if (IS_ERR(ebu_host->hsnand))
                return PTR_ERR(ebu_host->hsnand);
 
@@ -623,8 +621,8 @@ static int ebu_nand_probe(struct platform_device *pdev)
        ebu_host->cs_num = cs;
 
        resname = devm_kasprintf(dev, GFP_KERNEL, "nand_cs%d", cs);
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, resname);
-       ebu_host->cs[cs].chipaddr = devm_ioremap_resource(dev, res);
+       ebu_host->cs[cs].chipaddr = devm_platform_ioremap_resource_byname(pdev,
+                                                                         resname);
        if (IS_ERR(ebu_host->cs[cs].chipaddr))
                return PTR_ERR(ebu_host->cs[cs].chipaddr);