Merge tag '6.6-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6

[sfrench/cifs-2.6.git] / drivers / mtd / nand / raw / mxc_nand.c

diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index 3d4b2e8294ea6ba3bf990ca7af264024f1aadc66..003008355b3c29cd046bd6285d312f021b5971b9 100644 (file)
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -20,7 +20,6 @@
 #include <linux/irq.h>
 #include <linux/completion.h>
 #include <linux/of.h>
-#include <linux/of_device.h>
 
 #define DRIVER_NAME "mxc_nand"
 
@@ -1696,7 +1695,6 @@ static int mxcnd_probe(struct platform_device *pdev)
        struct nand_chip *this;
        struct mtd_info *mtd;
        struct mxc_nand_host *host;
-       struct resource *res;
        int err = 0;
 
        /* Allocate memory for MTD device structure and private data */
@@ -1740,17 +1738,15 @@ static int mxcnd_probe(struct platform_device *pdev)
                this->options |= NAND_KEEP_TIMINGS;
 
        if (host->devtype_data->needs_ip) {
-               res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-               host->regs_ip = devm_ioremap_resource(&pdev->dev, res);
+               host->regs_ip = devm_platform_ioremap_resource(pdev, 0);
                if (IS_ERR(host->regs_ip))
                        return PTR_ERR(host->regs_ip);
 
-               res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+               host->base = devm_platform_ioremap_resource(pdev, 1);
        } else {
-               res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+               host->base = devm_platform_ioremap_resource(pdev, 0);
        }
 
-       host->base = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(host->base))
                return PTR_ERR(host->base);