[PATCH] w1-gpio: Let device core handle pinctrl

[PATCH] w1-gpio: Let device core handle pinctrl

[Fabio Estevam]

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>
---
 drivers/w1/masters/w1-gpio.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
index 46d9701..f54ece2 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) {
-- 
1.8.1.2

Re: [PATCH] w1-gpio: Let device core handle pinctrl

[Evgeniy Polyakov]

Hi

On Mon, May 20, 2013 at 10:16:39AM -0300, Fabio Estevam (fabio.estevam@freescale.com) wrote:
> 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.

Sorry for long delay - is this patch still needed to be pushed upstream?
If so, Greg, please pull it into your tree.

Thank you.

> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
>  drivers/w1/masters/w1-gpio.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
> index 46d9701..f54ece2 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) {
> -- 
> 1.8.1.2
> 

-- 
	Evgeniy Polyakov