pinctrl: spear: Use devm_pinctrl_register() for pinctrl registration

Use devm_pinctrl_register() for pin control registration and remove
need of .remove callback.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Cc: Viresh Kumar <vireshk@kernel.org>
Cc: spear-devel@list.st.com
Cc: linux-arm-kernel@lists.infradead.org
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/spear/pinctrl-spear.c b/drivers/pinctrl/spear/pinctrl-spear.c
index 0afaf79a4e5175f99233726d07ea086758e72623..4db52ba38d8d3f8ca92cb3d12f780b18b4d0a794 100644 (file)
--- a/drivers/pinctrl/spear/pinctrl-spear.c
+++ b/drivers/pinctrl/spear/pinctrl-spear.c
@@ -395,7 +395,7 @@ int spear_pinctrl_probe(struct platform_device *pdev,
        spear_pinctrl_desc.pins = machdata->pins;
        spear_pinctrl_desc.npins = machdata->npins;
 
-       pmx->pctl = pinctrl_register(&spear_pinctrl_desc, &pdev->dev, pmx);
+       pmx->pctl = devm_pinctrl_register(&pdev->dev, &spear_pinctrl_desc, pmx);
        if (IS_ERR(pmx->pctl)) {
                dev_err(&pdev->dev, "Couldn't register pinctrl driver\n");
                return PTR_ERR(pmx->pctl);
@@ -403,12 +403,3 @@ int spear_pinctrl_probe(struct platform_device *pdev,
 
        return 0;
 }
-
-int spear_pinctrl_remove(struct platform_device *pdev)
-{
-       struct spear_pmx *pmx = platform_get_drvdata(pdev);
-
-       pinctrl_unregister(pmx->pctl);
-
-       return 0;
-}

diff --git a/drivers/pinctrl/spear/pinctrl-spear.h b/drivers/pinctrl/spear/pinctrl-spear.h
index 27c2cc8d83adcf8d9e60a91460c20b7cfc2e2dcf..aa5cf7032231770f23957ceb02837957f294bde2 100644 (file)
--- a/drivers/pinctrl/spear/pinctrl-spear.h
+++ b/drivers/pinctrl/spear/pinctrl-spear.h
@@ -197,7 +197,6 @@ void pmx_init_gpio_pingroup_addr(struct spear_gpio_pingroup *gpio_pingroup,
                                 unsigned count, u16 reg);
 int spear_pinctrl_probe(struct platform_device *pdev,
                        struct spear_pinctrl_machdata *machdata);
-int spear_pinctrl_remove(struct platform_device *pdev);
 
 #define SPEAR_PIN_0_TO_101             \
        PINCTRL_PIN(0, "PLGPIO0"),      \

diff --git a/drivers/pinctrl/spear/pinctrl-spear1310.c b/drivers/pinctrl/spear/pinctrl-spear1310.c
index 92611bb757acc2f4bbd75efdd575b6b3eb839e0b..18210681c737a9c454583403c4772231032bbdd6 100644 (file)
--- a/drivers/pinctrl/spear/pinctrl-spear1310.c
+++ b/drivers/pinctrl/spear/pinctrl-spear1310.c
@@ -2704,18 +2704,12 @@ static int spear1310_pinctrl_probe(struct platform_device *pdev)
        return spear_pinctrl_probe(pdev, &spear1310_machdata);
 }
 
-static int spear1310_pinctrl_remove(struct platform_device *pdev)
-{
-       return spear_pinctrl_remove(pdev);
-}
-
 static struct platform_driver spear1310_pinctrl_driver = {
        .driver = {
                .name = DRIVER_NAME,
                .of_match_table = spear1310_pinctrl_of_match,
        },
        .probe = spear1310_pinctrl_probe,
-       .remove = spear1310_pinctrl_remove,
 };
 
 static int __init spear1310_pinctrl_init(void)

diff --git a/drivers/pinctrl/spear/pinctrl-spear1340.c b/drivers/pinctrl/spear/pinctrl-spear1340.c
index f842e9dc40d0a85c5c056524edfb3752fe519597..c01fb23ee636cf01dfca147829a45176d49678de 100644 (file)
--- a/drivers/pinctrl/spear/pinctrl-spear1340.c
+++ b/drivers/pinctrl/spear/pinctrl-spear1340.c
@@ -2020,18 +2020,12 @@ static int spear1340_pinctrl_probe(struct platform_device *pdev)
        return spear_pinctrl_probe(pdev, &spear1340_machdata);
 }
 
-static int spear1340_pinctrl_remove(struct platform_device *pdev)
-{
-       return spear_pinctrl_remove(pdev);
-}
-
 static struct platform_driver spear1340_pinctrl_driver = {
        .driver = {
                .name = DRIVER_NAME,
                .of_match_table = spear1340_pinctrl_of_match,
        },
        .probe = spear1340_pinctrl_probe,
-       .remove = spear1340_pinctrl_remove,
 };
 
 static int __init spear1340_pinctrl_init(void)

diff --git a/drivers/pinctrl/spear/pinctrl-spear300.c b/drivers/pinctrl/spear/pinctrl-spear300.c
index d998a2ccff48ebd00b2a63ed938032ecc2b58a5c..111148daa3f12593357d4b66b2dd2bc33089696e 100644 (file)
--- a/drivers/pinctrl/spear/pinctrl-spear300.c
+++ b/drivers/pinctrl/spear/pinctrl-spear300.c
@@ -677,18 +677,12 @@ static int spear300_pinctrl_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int spear300_pinctrl_remove(struct platform_device *pdev)
-{
-       return spear_pinctrl_remove(pdev);
-}
-
 static struct platform_driver spear300_pinctrl_driver = {
        .driver = {
                .name = DRIVER_NAME,
                .of_match_table = spear300_pinctrl_of_match,
        },
        .probe = spear300_pinctrl_probe,
-       .remove = spear300_pinctrl_remove,
 };
 
 static int __init spear300_pinctrl_init(void)

diff --git a/drivers/pinctrl/spear/pinctrl-spear310.c b/drivers/pinctrl/spear/pinctrl-spear310.c
index 609b18aceb161269bf41e925930d096ceaae8afb..a7b000062985345cbfe31517a609c2a32ccb5110 100644 (file)
--- a/drivers/pinctrl/spear/pinctrl-spear310.c
+++ b/drivers/pinctrl/spear/pinctrl-spear310.c
@@ -400,18 +400,12 @@ static int spear310_pinctrl_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int spear310_pinctrl_remove(struct platform_device *pdev)
-{
-       return spear_pinctrl_remove(pdev);
-}
-
 static struct platform_driver spear310_pinctrl_driver = {
        .driver = {
                .name = DRIVER_NAME,
                .of_match_table = spear310_pinctrl_of_match,
        },
        .probe = spear310_pinctrl_probe,
-       .remove = spear310_pinctrl_remove,
 };
 
 static int __init spear310_pinctrl_init(void)

diff --git a/drivers/pinctrl/spear/pinctrl-spear320.c b/drivers/pinctrl/spear/pinctrl-spear320.c
index c07114431bd46c6541409e67c920ff6825a94a07..e2b3817701dcbc7ccbef5abe68f8a3f5b14e26c4 100644 (file)
--- a/drivers/pinctrl/spear/pinctrl-spear320.c
+++ b/drivers/pinctrl/spear/pinctrl-spear320.c
@@ -3441,18 +3441,12 @@ static int spear320_pinctrl_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int spear320_pinctrl_remove(struct platform_device *pdev)
-{
-       return spear_pinctrl_remove(pdev);
-}
-
 static struct platform_driver spear320_pinctrl_driver = {
        .driver = {
                .name = DRIVER_NAME,
                .of_match_table = spear320_pinctrl_of_match,
        },
        .probe = spear320_pinctrl_probe,
-       .remove = spear320_pinctrl_remove,
 };
 
 static int __init spear320_pinctrl_init(void)