Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e6e78e2 authored by Fabio Estevam's avatar Fabio Estevam Committed by Greg Kroah-Hartman
Browse files

w1-gpio: Let device core handle pinctrl 



Since commit ab78029e (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: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a0ea59d5

drivers/w1/masters/w1-gpio.c

+0 −6
Original line number Diff line number Diff line
@@ -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) {