drivers/net/can/c_can: don't use devm_pinctrl_get_select_default() in probe
authorWolfram Sang <wsa@the-dreams.de>
Wed, 10 Jul 2013 15:57:42 +0000 (16:57 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 12 Jul 2013 00:18:26 +0000 (17:18 -0700)
Since commit ab78029 (drivers/pinctrl: grab default handles from device core),
we can rely on device core for setting the default pins. Compile tested only.

Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13)
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/can/c_can/c_can_platform.c

index b918c73294265fdcf56737d20c6761cefd82874e..c6f838d922a51b3883f1dea9ba26f2e0a9c63c4b 100644 (file)
@@ -32,7 +32,6 @@
 #include <linux/clk.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
-#include <linux/pinctrl/consumer.h>
 
 #include <linux/can/dev.h>
 
@@ -114,7 +113,6 @@ static int c_can_plat_probe(struct platform_device *pdev)
        struct c_can_priv *priv;
        const struct of_device_id *match;
        const struct platform_device_id *id;
-       struct pinctrl *pinctrl;
        struct resource *mem, *res;
        int irq;
        struct clk *clk;
@@ -131,11 +129,6 @@ static int c_can_plat_probe(struct platform_device *pdev)
                id = platform_get_device_id(pdev);
        }
 
-       pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-       if (IS_ERR(pinctrl))
-               dev_warn(&pdev->dev,
-                       "failed to configure pins from driver\n");
-
        /* get the appropriate clk */
        clk = clk_get(&pdev->dev, NULL);
        if (IS_ERR(clk)) {