Skip to contentSkip to conversation

pinctrl: tz1090: Convert to devm_ioremap_resource

PATCH Superseded Axel Lin 3 participants 6 messages Aug 26, 2013 – Aug 28, 2013

Subsystems (2)
Tegra architecture support Pin control

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/2 pinctrl: tz1090: Convert to devm_ioremap_resource

Signed-off-by Axel Lin <[email protected]>
---
 drivers/pinctrl/pinctrl-tz1090.c | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)
drivers/pinctrl/pinctrl-tz1090.c +3 -19
index 4edae08..72d9552 100644
@@ -1996,25 +1996,9 @@ static int tz1090_pinctrl_probe(struct platform_device *pdev)
 	tz1090_pinctrl_desc.npins = ARRAY_SIZE(tz1090_pins);
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!res) {
-		dev_err(&pdev->dev, "Missing MEM resource\n");
-		return -ENODEV;
-	}
-
-	if (!devm_request_mem_region(&pdev->dev, res->start,
-				     resource_size(res),
-				     dev_name(&pdev->dev))) {
-		dev_err(&pdev->dev,
-			"Couldn't request MEM resource\n");
-		return -ENODEV;
-	}
-
-	pmx->regs = devm_ioremap(&pdev->dev, res->start,
-				 resource_size(res));
-	if (!pmx->regs) {
-		dev_err(&pdev->dev, "Couldn't ioremap regs\n");
-		return -ENODEV;
-	}
+	pmx->regs = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(pmx->regs))
+		return PTR_ERR(pmx->regs);
 
 	pmx->pctl = pinctrl_register(&tz1090_pinctrl_desc, &pdev->dev, pmx);
 	if (!pmx->pctl) {
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH 2/2 pinctrl: tz1090-pdc: Convert to devm_ioremap_resource

Signed-off-by Axel Lin <[email protected]>
---
 drivers/pinctrl/pinctrl-tz1090-pdc.c | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)
drivers/pinctrl/pinctrl-tz1090-pdc.c +3 -19
index d4f12cc..494ad4b 100644
@@ -949,25 +949,9 @@ static int tz1090_pdc_pinctrl_probe(struct platform_device *pdev)
 	tz1090_pdc_pinctrl_desc.npins = ARRAY_SIZE(tz1090_pdc_pins);
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!res) {
-		dev_err(&pdev->dev, "Missing MEM resource\n");
-		return -ENODEV;
-	}
-
-	if (!devm_request_mem_region(&pdev->dev, res->start,
-				     resource_size(res),
-				     dev_name(&pdev->dev))) {
-		dev_err(&pdev->dev,
-			"Couldn't request MEM resource\n");
-		return -ENODEV;
-	}
-
-	pmx->regs = devm_ioremap(&pdev->dev, res->start,
-				 resource_size(res));
-	if (!pmx->regs) {
-		dev_err(&pdev->dev, "Couldn't ioremap regs\n");
-		return -ENODEV;
-	}
+	pmx->regs = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(pmx->regs))
+		return PTR_ERR(pmx->regs);
 
 	pmx->pctl = pinctrl_register(&tz1090_pdc_pinctrl_desc, &pdev->dev, pmx);
 	if (!pmx->pctl) {
Signature · 1 line
1.8.1.2