]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
pinctrl: merrifield: Use devm_platform_ioremap_resource()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 3 Jul 2019 14:44:20 +0000 (17:44 +0300)
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 23 Jul 2019 13:13:14 +0000 (16:13 +0300)
Use the new helper that wraps the calls to platform_get_resource()
and devm_ioremap_resource() together.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
drivers/pinctrl/intel/pinctrl-merrifield.c

index 4b65e1296b8af7542437ec5d9b48bb840a2528b2..04ca8ae95df833e8b257f3f28fc803bbd25b951a 100644 (file)
@@ -885,7 +885,6 @@ static int mrfld_pinctrl_probe(struct platform_device *pdev)
 {
        struct mrfld_family *families;
        struct mrfld_pinctrl *mp;
-       struct resource *mem;
        void __iomem *regs;
        size_t nfamilies;
        unsigned int i;
@@ -897,8 +896,7 @@ static int mrfld_pinctrl_probe(struct platform_device *pdev)
        mp->dev = &pdev->dev;
        raw_spin_lock_init(&mp->lock);
 
-       mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       regs = devm_ioremap_resource(&pdev->dev, mem);
+       regs = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(regs))
                return PTR_ERR(regs);