Commit fa01aff9 authored by Andy Shevchenko's avatar Andy Shevchenko

pinctrl: merrifield: Use devm_platform_ioremap_resource()

Use the new helper that wraps the calls to platform_get_resource()
and devm_ioremap_resource() together.
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent 9d5b6a95
...@@ -885,7 +885,6 @@ static int mrfld_pinctrl_probe(struct platform_device *pdev) ...@@ -885,7 +885,6 @@ static int mrfld_pinctrl_probe(struct platform_device *pdev)
{ {
struct mrfld_family *families; struct mrfld_family *families;
struct mrfld_pinctrl *mp; struct mrfld_pinctrl *mp;
struct resource *mem;
void __iomem *regs; void __iomem *regs;
size_t nfamilies; size_t nfamilies;
unsigned int i; unsigned int i;
...@@ -897,8 +896,7 @@ static int mrfld_pinctrl_probe(struct platform_device *pdev) ...@@ -897,8 +896,7 @@ static int mrfld_pinctrl_probe(struct platform_device *pdev)
mp->dev = &pdev->dev; mp->dev = &pdev->dev;
raw_spin_lock_init(&mp->lock); raw_spin_lock_init(&mp->lock);
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); regs = devm_platform_ioremap_resource(pdev, 0);
regs = devm_ioremap_resource(&pdev->dev, mem);
if (IS_ERR(regs)) if (IS_ERR(regs))
return PTR_ERR(regs); return PTR_ERR(regs);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment