diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2014-05-27 02:29:17 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-05-27 10:03:24 -0400 |
| commit | 49cfabc20ac9ab6117093460a5ac418922e8e9b0 (patch) | |
| tree | 629f65071a680a25fe7a05c58b3c57788fcd2f65 /drivers/pinctrl | |
| parent | 648e42e1401542d153090f188d0ef3406a40ac76 (diff) | |
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 0d8fd509ab20..dcd4f6a4fc50 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) | |||
| 243 | return -ENOMEM; | 243 | return -ENOMEM; |
| 244 | 244 | ||
| 245 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 245 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 246 | base = devm_request_and_ioremap(&pdev->dev, res); | 246 | base = devm_ioremap_resource(&pdev->dev, res); |
| 247 | if (!base) | 247 | if (IS_ERR(base)) |
| 248 | return -EADDRNOTAVAIL; | 248 | return PTR_ERR(base); |
| 249 | 249 | ||
| 250 | rmconfig->reg_bits = 32, | 250 | rmconfig->reg_bits = 32, |
| 251 | rmconfig->val_bits = 32, | 251 | rmconfig->val_bits = 32, |
diff --git a/drivers/pinctrl/berlin/berlin-bg2cd.c b/drivers/pinctrl/berlin/berlin-bg2cd.c index e095a5d94395..89d585ef7da7 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) | |||
| 186 | return -ENOMEM; | 186 | return -ENOMEM; |
| 187 | 187 | ||
| 188 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 188 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 189 | base = devm_request_and_ioremap(&pdev->dev, res); | 189 | base = devm_ioremap_resource(&pdev->dev, res); |
| 190 | if (!base) | 190 | if (IS_ERR(base)) |
| 191 | return -EADDRNOTAVAIL; | 191 | return PTR_ERR(base); |
| 192 | 192 | ||
| 193 | rmconfig->reg_bits = 32, | 193 | rmconfig->reg_bits = 32, |
| 194 | rmconfig->val_bits = 32, | 194 | rmconfig->val_bits = 32, |
diff --git a/drivers/pinctrl/berlin/berlin-bg2q.c b/drivers/pinctrl/berlin/berlin-bg2q.c index ab33a3b60056..9fcf9836045c 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) | |||
| 405 | return -ENOMEM; | 405 | return -ENOMEM; |
| 406 | 406 | ||
| 407 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 407 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 408 | base = devm_request_and_ioremap(&pdev->dev, res); | 408 | base = devm_ioremap_resource(&pdev->dev, res); |
| 409 | if (!base) | 409 | if (IS_ERR(base)) |
| 410 | return -EADDRNOTAVAIL; | 410 | return PTR_ERR(base); |
| 411 | 411 | ||
| 412 | rmconfig->reg_bits = 32, | 412 | rmconfig->reg_bits = 32, |
| 413 | rmconfig->val_bits = 32, | 413 | rmconfig->val_bits = 32, |