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

Commit d25903f8 authored by Wolfram Sang's avatar Wolfram Sang Committed by David S. Miller
Browse files

drivers/net/can/c_can: don't use devm_pinctrl_get_select_default() in probe 



Since commit ab78029e (drivers/pinctrl: grab default handles from device core),
we can rely on device core for setting the default pins. Compile tested only.

Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13)
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Acked-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c073f666

drivers/net/can/c_can/c_can_platform.c

+0 −7
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <linux/clk.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/pinctrl/consumer.h>



#include <linux/can/dev.h>
@@ -114,7 +113,6 @@ static int c_can_plat_probe(struct platform_device *pdev) 
	struct c_can_priv *priv;

	const struct of_device_id *match;

	const struct platform_device_id *id;

	struct pinctrl *pinctrl;

	struct resource *mem, *res;

	int irq;

	struct clk *clk;
@@ -131,11 +129,6 @@ static int c_can_plat_probe(struct platform_device *pdev) 
		id = platform_get_device_id(pdev);

	}



	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl))

		dev_warn(&pdev->dev,

			"failed to configure pins from driver\n");



	/* get the appropriate clk */

	clk = clk_get(&pdev->dev, NULL);

	if (IS_ERR(clk)) {