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

Commit 4d7f7635 authored by Fabio Estevam's avatar Fabio Estevam Committed by Marc Kleine-Budde
Browse files

can: flexcan: 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.

Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: <linux-can@vger.kernel.org>
Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 5865fc1b

drivers/net/can/flexcan.c

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

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/pinctrl/consumer.h>





#define DRV_NAME			"flexcan"

#define DRV_NAME			"flexcan"
@@ -1004,16 +1003,11 @@ static int flexcan_probe(struct platform_device *pdev) 
	struct flexcan_priv *priv;

	struct flexcan_priv *priv;

	struct resource *mem;

	struct resource *mem;

	struct clk *clk_ipg = NULL, *clk_per = NULL;

	struct clk *clk_ipg = NULL, *clk_per = NULL;

	struct pinctrl *pinctrl;

	void __iomem *base;

	void __iomem *base;

	resource_size_t mem_size;

	resource_size_t mem_size;

	int err, irq;

	int err, irq;

	u32 clock_freq = 0;

	u32 clock_freq = 0;





	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl))

		return PTR_ERR(pinctrl);



	if (pdev->dev.of_node)

	if (pdev->dev.of_node)

		of_property_read_u32(pdev->dev.of_node,

		of_property_read_u32(pdev->dev.of_node,

						"clock-frequency", &clock_freq);

						"clock-frequency", &clock_freq);