aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/berlin
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pinctrl/berlin')
-rw-r--r--drivers/pinctrl/berlin/berlin-bg2.c6
-rw-r--r--drivers/pinctrl/berlin/berlin-bg2cd.c6
-rw-r--r--drivers/pinctrl/berlin/berlin-bg2q.c6
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,