diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2014-05-27 15:29:17 +0900 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-05-27 16:03:24 +0200 |
| commit | 49cfabc20ac9ab6117093460a5ac418922e8e9b0 (patch) | |
| tree | 629f65071a680a25fe7a05c58b3c57788fcd2f65 /drivers/pinctrl | |
| parent | 648e42e1401542d153090f188d0ef3406a40ac76 (diff) | |
| download | op-kernel-dev-49cfabc20ac9ab6117093460a5ac418922e8e9b0.zip op-kernel-dev-49cfabc20ac9ab6117093460a5ac418922e8e9b0.tar.gz | |
pinctrl: berlin: Use devm_ioremap_resource()
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>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/berlin/berlin-bg2.c | 6 | ||||
| -rw-r--r-- | drivers/pinctrl/berlin/berlin-bg2cd.c | 6 | ||||
| -rw-r--r-- | drivers/pinctrl/berlin/berlin-bg2q.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/pinctrl/berlin/berlin-bg2.c b/drivers/pinctrl/berlin/berlin-bg2.c index 0d8fd50..dcd4f6a 100644 --- a/drivers/pinctrl/berlin/berlin-bg2.c +++ b/drivers/pinctrl/berlin/berlin-bg2.c @@ -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, diff --git a/drivers/pinctrl/berlin/berlin-bg2cd.c b/drivers/pinctrl/berlin/berlin-bg2cd.c index e095a5d..89d585e 100644 --- a/drivers/pinctrl/berlin/berlin-bg2cd.c +++ b/drivers/pinctrl/berlin/berlin-bg2cd.c @@ -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, diff --git a/drivers/pinctrl/berlin/berlin-bg2q.c b/drivers/pinctrl/berlin/berlin-bg2q.c index ab33a3b..9fcf983 100644 --- a/drivers/pinctrl/berlin/berlin-bg2q.c +++ b/drivers/pinctrl/berlin/berlin-bg2q.c @@ -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, |
