diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-05-20 09:16:39 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-21 13:07:54 -0400 |
commit | 5e6e78e27a27179bb80545a2a55b8c3ae667aed8 (patch) | |
tree | 01bf27d7360e526a2f022cab72d9949295395a85 /drivers/w1 | |
parent | a0ea59d56dfab021ecc65365275e532c6b937adb (diff) |
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 @@ | |||
16 | #include <linux/gpio.h> | 16 | #include <linux/gpio.h> |
17 | #include <linux/of_platform.h> | 17 | #include <linux/of_platform.h> |
18 | #include <linux/of_gpio.h> | 18 | #include <linux/of_gpio.h> |
19 | #include <linux/pinctrl/consumer.h> | ||
20 | #include <linux/err.h> | 19 | #include <linux/err.h> |
21 | #include <linux/of.h> | 20 | #include <linux/of.h> |
22 | 21 | ||
@@ -78,13 +77,8 @@ static int w1_gpio_probe(struct platform_device *pdev) | |||
78 | { | 77 | { |
79 | struct w1_bus_master *master; | 78 | struct w1_bus_master *master; |
80 | struct w1_gpio_platform_data *pdata; | 79 | struct w1_gpio_platform_data *pdata; |
81 | struct pinctrl *pinctrl; | ||
82 | int err; | 80 | int err; |
83 | 81 | ||
84 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | ||
85 | if (IS_ERR(pinctrl)) | ||
86 | dev_warn(&pdev->dev, "unable to select pin group\n"); | ||
87 | |||
88 | if (of_have_populated_dt()) { | 82 | if (of_have_populated_dt()) { |
89 | err = w1_gpio_probe_dt(pdev); | 83 | err = w1_gpio_probe_dt(pdev); |
90 | if (err < 0) { | 84 | if (err < 0) { |