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 / atmel / nand-controller.c

diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c
index 81e3d682a8cde430714d23486f6249bf381b8346..3f494f7c7ecbdb8e464d873909dfe70d370ea57e 100644 (file)
--- a/drivers/mtd/nand/raw/atmel/nand-controller.c
+++ b/drivers/mtd/nand/raw/atmel/nand-controller.c
@@ -1791,8 +1791,7 @@ atmel_nand_controller_legacy_add_nands(struct atmel_nand_controller *nc)
 
        nand->numcs = 1;
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       nand->cs[0].io.virt = devm_ioremap_resource(dev, res);
+       nand->cs[0].io.virt = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
        if (IS_ERR(nand->cs[0].io.virt))
                return PTR_ERR(nand->cs[0].io.virt);