diff options
| author | Fabio Estevam | 2013-05-20 15:06:18 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde | 2013-06-03 13:13:48 +0200 |
| commit | 4d7f7635f75da2924916946cb7ac49c5603b44c7 (patch) | |
| tree | 7cab4c0908f9ace8176175144a50835c86e40379 /drivers/net/can | |
| parent | tg3: remove redundant pm init code (diff) | |
| download | kernel-qcow2-linux-4d7f7635f75da2924916946cb7ac49c5603b44c7.tar.gz kernel-qcow2-linux-4d7f7635f75da2924916946cb7ac49c5603b44c7.tar.xz kernel-qcow2-linux-4d7f7635f75da2924916946cb7ac49c5603b44c7.zip | |
can: flexcan: 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.
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: <linux-can@vger.kernel.org>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/flexcan.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 4a40a186c8c8..a93cdb29fb3f 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -37,7 +37,6 @@ #include <linux/of.h> #include <linux/of_device.h> #include <linux/platform_device.h> -#include <linux/pinctrl/consumer.h> #define DRV_NAME "flexcan" @@ -1004,16 +1003,11 @@ static int flexcan_probe(struct platform_device *pdev) struct flexcan_priv *priv; struct resource *mem; struct clk *clk_ipg = NULL, *clk_per = NULL; - struct pinctrl *pinctrl; void __iomem *base; resource_size_t mem_size; int err, irq; 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) of_property_read_u32(pdev->dev.of_node, "clock-frequency", &clock_freq); |