diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-05-20 10:16:39 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-21 10:07:54 -0700 |
| commit | 5e6e78e27a27179bb80545a2a55b8c3ae667aed8 (patch) | |
| tree | 01bf27d7360e526a2f022cab72d9949295395a85 /drivers/w1 | |
| parent | a0ea59d56dfab021ecc65365275e532c6b937adb (diff) | |
| download | kernel-common-5e6e78e27a27179bb80545a2a55b8c3ae667aed8.tar.gz kernel-common-5e6e78e27a27179bb80545a2a55b8c3ae667aed8.tar.bz2 kernel-common-5e6e78e27a27179bb80545a2a55b8c3ae667aed8.zip | |
w1-gpio: Let device core handle pinctrl
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>
Diffstat (limited to 'drivers/w1')
| -rw-r--r-- | drivers/w1/masters/w1-gpio.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c index 46d97014342e..f54ece268c98 100644 --- a/drivers/w1/masters/w1-gpio.c +++ b/drivers/w1/masters/w1-gpio.c @@ -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) { |