Skip to contentSkip to conversation

pinctrl: berlin: Use devm_ioremap_resource()

PATCH In review Jingoo Han 3 participants 3 messages May 27, 2014 Pin control

lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 drivers/pinctrl/berlin/berlin-bg2.c   |    6 +++---
 drivers/pinctrl/berlin/berlin-bg2cd.c |    6 +++---
 drivers/pinctrl/berlin/berlin-bg2q.c  |    6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)
drivers/pinctrl/berlin/berlin-bg2.c +3 -3
index 0d8fd50..dcd4f6a 100644
@@ -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,
drivers/pinctrl/berlin/berlin-bg2cd.c +3 -3
index e095a5d..89d585e 100644
@@ -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,
drivers/pinctrl/berlin/berlin-bg2q.c +3 -3
index ab33a3b..9fcf983 100644
@@ -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,
Signature · 1 line
1.7.10.4
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Jingoo Han

Use devm_ioremap_resource() because devm_request_and_ioremap() is obsoleted by devm_ioremap_resource().

Signed-off-by Jingoo Han <[email protected]>
Acked-by Antoine Ténart <[email protected]>

Thanks!

Antoine

Quoted 61 lines
---
 drivers/pinctrl/berlin/berlin-bg2.c   |    6 +++---
 drivers/pinctrl/berlin/berlin-bg2cd.c |    6 +++---
 drivers/pinctrl/berlin/berlin-bg2q.c  |    6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)
drivers/pinctrl/berlin/berlin-bg2.c +3 -3
index 0d8fd50..dcd4f6a 100644
@@ -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,
drivers/pinctrl/berlin/berlin-bg2cd.c +3 -3
index e095a5d..89d585e 100644
@@ -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,
drivers/pinctrl/berlin/berlin-bg2q.c +3 -3
index ab33a3b..9fcf983 100644
@@ -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,
Signature · 1 line
1.7.10.4
Signature · 3 lines
Antoine Ténart, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com