Skip to content

Commit

Permalink
pinctrl: berlin: Use devm_ioremap_resource()
Browse files Browse the repository at this point in the history
Use devm_ioremap_resource() because devm_request_and_ioremap() is
obsoleted by devm_ioremap_resource().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Jingoo Han authored and Linus Walleij committed May 27, 2014
1 parent 648e42e commit 49cfabc
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions drivers/pinctrl/berlin/berlin-bg2.c
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,9 @@ static int berlin2_pinctrl_probe(struct platform_device *pdev)
return -ENOMEM;

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
base = devm_request_and_ioremap(&pdev->dev, res);
if (!base)
return -EADDRNOTAVAIL;
base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(base))
return PTR_ERR(base);

rmconfig->reg_bits = 32,
rmconfig->val_bits = 32,
Expand Down
6 changes: 3 additions & 3 deletions drivers/pinctrl/berlin/berlin-bg2cd.c
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,9 @@ static int berlin2cd_pinctrl_probe(struct platform_device *pdev)
return -ENOMEM;

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
base = devm_request_and_ioremap(&pdev->dev, res);
if (!base)
return -EADDRNOTAVAIL;
base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(base))
return PTR_ERR(base);

rmconfig->reg_bits = 32,
rmconfig->val_bits = 32,
Expand Down
6 changes: 3 additions & 3 deletions drivers/pinctrl/berlin/berlin-bg2q.c
Original file line number Diff line number Diff line change
Expand Up @@ -405,9 +405,9 @@ static int berlin2q_pinctrl_probe(struct platform_device *pdev)
return -ENOMEM;

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
base = devm_request_and_ioremap(&pdev->dev, res);
if (!base)
return -EADDRNOTAVAIL;
base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(base))
return PTR_ERR(base);

rmconfig->reg_bits = 32,
rmconfig->val_bits = 32,
Expand Down

0 comments on commit 49cfabc

Please sign in to comment.