]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
w1-gpio: Let device core handle pinctrl
authorFabio Estevam <fabio.estevam@freescale.com>
Mon, 20 May 2013 13:16:39 +0000 (10:16 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 21 May 2013 17:07:54 +0000 (10:07 -0700)
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.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/w1/masters/w1-gpio.c

index 46d97014342ef1f27f37046332e35d6e40a5b108..f54ece268c982d1dce13224c78efce9434dbffbb 100644 (file)
@@ -16,7 +16,6 @@
 #include <linux/gpio.h>
 #include <linux/of_platform.h>
 #include <linux/of_gpio.h>
-#include <linux/pinctrl/consumer.h>
 #include <linux/err.h>
 #include <linux/of.h>
 
@@ -78,13 +77,8 @@ static int w1_gpio_probe(struct platform_device *pdev)
 {
        struct w1_bus_master *master;
        struct w1_gpio_platform_data *pdata;
-       struct pinctrl *pinctrl;
        int err;
 
-       pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
-       if (IS_ERR(pinctrl))
-               dev_warn(&pdev->dev, "unable to select pin group\n");
-
        if (of_have_populated_dt()) {
                err = w1_gpio_probe_dt(pdev);
                if (err < 0) {