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

[sfrench/cifs-2.6.git] / drivers / media / platform / samsung / exynos4-is / fimc-core.c

diff --git a/drivers/media/platform/samsung/exynos4-is/fimc-core.c b/drivers/media/platform/samsung/exynos4-is/fimc-core.c
index 976b4f747ad45d346b4e5af60a4b6b563df5c59e..97908778e1c8bca88b0e0022c525109649fc18ab 100644 (file)
--- a/drivers/media/platform/samsung/exynos4-is/fimc-core.c
+++ b/drivers/media/platform/samsung/exynos4-is/fimc-core.c
@@ -19,7 +19,6 @@
 #include <linux/mfd/syscon.h>
 #include <linux/io.h>
 #include <linux/of.h>
-#include <linux/of_device.h>
 #include <linux/slab.h>
 #include <linux/clk.h>
 #include <media/v4l2-ioctl.h>
@@ -924,7 +923,6 @@ static int fimc_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        u32 lclk_freq = 0;
        struct fimc_dev *fimc;
-       struct resource *res;
        int ret = 0;
        int irq;
 
@@ -961,8 +959,7 @@ static int fimc_probe(struct platform_device *pdev)
                        return PTR_ERR(fimc->sysreg);
        }
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       fimc->regs = devm_ioremap_resource(dev, res);
+       fimc->regs = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(fimc->regs))
                return PTR_ERR(fimc->regs);