Skip to contentSkip to conversation

pinctrl: mediatek: use devm_platform_ioremap_resource_byname()

PATCH In review Wang Xiaojun 3 participants 3 messages Sep 17, 2020 – Sep 30, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pinctrl: mediatek: use devm_platform_ioremap_resource_byname()

Use the devm_platform_ioremap_resource_byname() helper instead of calling platform_get_resource_byname() and devm_ioremap_resource() separately.

---
 drivers/pinctrl/mediatek/pinctrl-moore.c         | 11 ++---------
 drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c |  9 +--------
 drivers/pinctrl/mediatek/pinctrl-paris.c         | 11 ++---------
 3 files changed, 5 insertions(+), 26 deletions(-)
drivers/pinctrl/mediatek/pinctrl-moore.c +2 -9
index aa1068d2867f..5e00f93ac998 100644
@@ -589,7 +589,6 @@ int mtk_moore_pinctrl_probe(struct platform_device *pdev,
 			    const struct mtk_pin_soc *soc)
 {
 	struct pinctrl_pin_desc *pins;
-	struct resource *res;
 	struct mtk_pinctrl *hw;
 	int err, i;
 
@@ -612,14 +611,8 @@ int mtk_moore_pinctrl_probe(struct platform_device *pdev,
 		return -ENOMEM;
 
 	for (i = 0; i < hw->soc->nbase_names; i++) {
-		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-						   hw->soc->base_names[i]);
-		if (!res) {
-			dev_err(&pdev->dev, "missing IO resource\n");
-			return -ENXIO;
-		}
-
-		hw->base[i] = devm_ioremap_resource(&pdev->dev, res);
+		hw->base[i] = devm_platform_ioremap_resource_byname(pdev,
+						hw->soc->base_names[i]);
 		if (IS_ERR(hw->base[i]))
 			return PTR_ERR(hw->base[i]);
 	}
drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c +1 -8
index 2f3dfb56c3fa..e8622c7e117a 100644
@@ -354,7 +354,6 @@ static const struct mtk_eint_xt mtk_eint_xt = {
 int mtk_build_eint(struct mtk_pinctrl *hw, struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;
-	struct resource *res;
 
 	if (!IS_ENABLED(CONFIG_EINT_MTK))
 		return 0;
@@ -366,13 +365,7 @@ int mtk_build_eint(struct mtk_pinctrl *hw, struct platform_device *pdev)
 	if (!hw->eint)
 		return -ENOMEM;
 
-	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "eint");
-	if (!res) {
-		dev_err(&pdev->dev, "Unable to get eint resource\n");
-		return -ENODEV;
-	}
-
-	hw->eint->base = devm_ioremap_resource(&pdev->dev, res);
+	hw->eint->base = devm_platform_ioremap_resource_byname(pdev, "eint");
 	if (IS_ERR(hw->eint->base))
 		return PTR_ERR(hw->eint->base);
 
drivers/pinctrl/mediatek/pinctrl-paris.c +2 -9
index a23c18251965..623af4410b07 100644
@@ -940,7 +940,6 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev,
 {
 	struct pinctrl_pin_desc *pins;
 	struct mtk_pinctrl *hw;
-	struct resource *res;
 	int err, i;
 
 	hw = devm_kzalloc(&pdev->dev, sizeof(*hw), GFP_KERNEL);
@@ -963,14 +962,8 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev,
 		return -ENOMEM;
 
 	for (i = 0; i < hw->soc->nbase_names; i++) {
-		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-						   hw->soc->base_names[i]);
-		if (!res) {
-			dev_err(&pdev->dev, "missing IO resource\n");
-			return -ENXIO;
-		}
-
-		hw->base[i] = devm_ioremap_resource(&pdev->dev, res);
+		hw->base[i] = devm_platform_ioremap_resource_byname(pdev,
+					hw->soc->base_names[i]);
 		if (IS_ERR(hw->base[i]))
 			return PTR_ERR(hw->base[i]);
 	}
Signature · 7 lines
2.25.1


_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Wang Xiaojun

Use the devm_platform_ioremap_resource_byname() helper instead of calling platform_get_resource_byname() and devm_ioremap_resource() separately.

Quoted 94 lines
---
 drivers/pinctrl/mediatek/pinctrl-moore.c         | 11 ++---------
 drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c |  9 +--------
 drivers/pinctrl/mediatek/pinctrl-paris.c         | 11 ++---------
 3 files changed, 5 insertions(+), 26 deletions(-)
drivers/pinctrl/mediatek/pinctrl-moore.c +2 -9
index aa1068d2867f..5e00f93ac998 100644
@@ -589,7 +589,6 @@ int mtk_moore_pinctrl_probe(struct platform_device *pdev,
                            const struct mtk_pin_soc *soc)
 {
        struct pinctrl_pin_desc *pins;
-       struct resource *res;
        struct mtk_pinctrl *hw;
        int err, i;
 
@@ -612,14 +611,8 @@ int mtk_moore_pinctrl_probe(struct platform_device *pdev,
                return -ENOMEM;
 
        for (i = 0; i < hw->soc->nbase_names; i++) {
-               res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-                                                  hw->soc->base_names[i]);
-               if (!res) {
-                       dev_err(&pdev->dev, "missing IO resource\n");
-                       return -ENXIO;
-               }
-
-               hw->base[i] = devm_ioremap_resource(&pdev->dev, res);
+               hw->base[i] = devm_platform_ioremap_resource_byname(pdev,
+                                               hw->soc->base_names[i]);
                if (IS_ERR(hw->base[i]))
                        return PTR_ERR(hw->base[i]);
        }
drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c +1 -8
index 2f3dfb56c3fa..e8622c7e117a 100644
@@ -354,7 +354,6 @@ static const struct mtk_eint_xt mtk_eint_xt = {
 int mtk_build_eint(struct mtk_pinctrl *hw, struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
-       struct resource *res;
 
        if (!IS_ENABLED(CONFIG_EINT_MTK))
                return 0;
@@ -366,13 +365,7 @@ int mtk_build_eint(struct mtk_pinctrl *hw, struct platform_device *pdev)
        if (!hw->eint)
                return -ENOMEM;
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "eint");
-       if (!res) {
-               dev_err(&pdev->dev, "Unable to get eint resource\n");
-               return -ENODEV;
-       }
-
-       hw->eint->base = devm_ioremap_resource(&pdev->dev, res);
+       hw->eint->base = devm_platform_ioremap_resource_byname(pdev, "eint");
        if (IS_ERR(hw->eint->base))
                return PTR_ERR(hw->eint->base);
 
drivers/pinctrl/mediatek/pinctrl-paris.c +2 -10
index a23c18251965..623af4410b07 100644
@@ -940,7 +940,6 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev,
 {
        struct pinctrl_pin_desc *pins;
        struct mtk_pinctrl *hw;
-       struct resource *res;
        int err, i;
 
        hw = devm_kzalloc(&pdev->dev, sizeof(*hw), GFP_KERNEL);
@@ -963,14 +962,8 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev,
                return -ENOMEM;
 
        for (i = 0; i < hw->soc->nbase_names; i++) {
-               res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-                                                  hw->soc->base_names[i]);
-               if (!res) {
-                       dev_err(&pdev->dev, "missing IO resource\n");
-                       return -ENXIO;
-               }
-
-               hw->base[i] = devm_ioremap_resource(&pdev->dev, res);
+               hw->base[i] = devm_platform_ioremap_resource_byname(pdev,
+                                       hw->soc->base_names[i]);
                if (IS_ERR(hw->base[i]))
                        return PTR_ERR(hw->base[i]);
        }
--

2.25.1