pwm: mxs: Let device core handle pinctrl
authorFabio Estevam <fabio.estevam@freescale.com>
Mon, 6 May 2013 18:05:54 +0000 (15:05 -0300)
committerThierry Reding <thierry.reding@gmail.com>
Mon, 27 May 2013 15:48:33 +0000 (17:48 +0200)
Since commit ab78029 (drivers/pinctrl: grab default handles from device core),
we can rely on device core for handling pinctrl.

So remove devm_pinctrl_get_select_default() from the driver.

Cc: Thierry Reding <thierry.reding@avionic-design.de>
Cc: <linux-kernel@vger.kernel.org>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
drivers/pwm/pwm-mxs.c

index 3febdddf71f9aa77a8d240d126c008fccf8827d2..6489a4b759437236d803a52dc657fc5090ef5922 100644 (file)
@@ -16,7 +16,6 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
-#include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
 #include <linux/pwm.h>
 #include <linux/slab.h>
@@ -130,7 +129,6 @@ static int mxs_pwm_probe(struct platform_device *pdev)
        struct device_node *np = pdev->dev.of_node;
        struct mxs_pwm_chip *mxs;
        struct resource *res;
-       struct pinctrl *pinctrl;
        int ret;
 
        mxs = devm_kzalloc(&pdev->dev, sizeof(*mxs), GFP_KERNEL);
@@ -142,10 +140,6 @@ static int mxs_pwm_probe(struct platform_device *pdev)
        if (IS_ERR(mxs->base))
                return PTR_ERR(mxs->base);
 
-       pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-       if (IS_ERR(pinctrl))
-               return PTR_ERR(pinctrl);
-
        mxs->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(mxs->clk))
                return PTR_ERR(mxs->clk);