aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-05-20 09:06:18 -0400
committerMarc Kleine-Budde <mkl@pengutronix.de>2013-06-03 07:13:48 -0400
commit4d7f7635f75da2924916946cb7ac49c5603b44c7 (patch)
tree7cab4c0908f9ace8176175144a50835c86e40379 /drivers/net/can
parent5865fc1b6a99bc7dcf245770c2735577b8596b6e (diff)
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.c6
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 @@
37#include <linux/of.h> 37#include <linux/of.h>
38#include <linux/of_device.h> 38#include <linux/of_device.h>
39#include <linux/platform_device.h> 39#include <linux/platform_device.h>
40#include <linux/pinctrl/consumer.h>
41 40
42#define DRV_NAME "flexcan" 41#define DRV_NAME "flexcan"
43 42
@@ -1004,16 +1003,11 @@ static int flexcan_probe(struct platform_device *pdev)
1004 struct flexcan_priv *priv; 1003 struct flexcan_priv *priv;
1005 struct resource *mem; 1004 struct resource *mem;
1006 struct clk *clk_ipg = NULL, *clk_per = NULL; 1005 struct clk *clk_ipg = NULL, *clk_per = NULL;
1007 struct pinctrl *pinctrl;
1008 void __iomem *base; 1006 void __iomem *base;
1009 resource_size_t mem_size; 1007 resource_size_t mem_size;
1010 int err, irq; 1008 int err, irq;
1011 u32 clock_freq = 0; 1009 u32 clock_freq = 0;
1012 1010
1013 pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
1014 if (IS_ERR(pinctrl))
1015 return PTR_ERR(pinctrl);
1016
1017 if (pdev->dev.of_node) 1011 if (pdev->dev.of_node)
1018 of_property_read_u32(pdev->dev.of_node, 1012 of_property_read_u32(pdev->dev.of_node,
1019 "clock-frequency", &clock_freq); 1013 "clock-frequency", &clock_freq);