aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2013-07-10 11:57:42 -0400
committerDavid S. Miller <davem@davemloft.net>2013-07-11 20:18:26 -0400
commitd25903f894849fa799141e774c4ad34199e3e6a1 (patch)
tree674c06ea1d8bd19000df23082a8ce99552b07fb2
parentc073f666ff5c38477849c5109f2c430df1a60e82 (diff)
drivers/net/can/c_can: don't use devm_pinctrl_get_select_default() in probe
Since commit ab78029 (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: Wolfram Sang <wsa@the-dreams.de> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/can/c_can/c_can_platform.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
index b918c7329426..c6f838d922a5 100644
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -32,7 +32,6 @@
32#include <linux/clk.h> 32#include <linux/clk.h>
33#include <linux/of.h> 33#include <linux/of.h>
34#include <linux/of_device.h> 34#include <linux/of_device.h>
35#include <linux/pinctrl/consumer.h>
36 35
37#include <linux/can/dev.h> 36#include <linux/can/dev.h>
38 37
@@ -114,7 +113,6 @@ static int c_can_plat_probe(struct platform_device *pdev)
114 struct c_can_priv *priv; 113 struct c_can_priv *priv;
115 const struct of_device_id *match; 114 const struct of_device_id *match;
116 const struct platform_device_id *id; 115 const struct platform_device_id *id;
117 struct pinctrl *pinctrl;
118 struct resource *mem, *res; 116 struct resource *mem, *res;
119 int irq; 117 int irq;
120 struct clk *clk; 118 struct clk *clk;
@@ -131,11 +129,6 @@ static int c_can_plat_probe(struct platform_device *pdev)
131 id = platform_get_device_id(pdev); 129 id = platform_get_device_id(pdev);
132 } 130 }
133 131
134 pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
135 if (IS_ERR(pinctrl))
136 dev_warn(&pdev->dev,
137 "failed to configure pins from driver\n");
138
139 /* get the appropriate clk */ 132 /* get the appropriate clk */
140 clk = clk_get(&pdev->dev, NULL); 133 clk = clk_get(&pdev->dev, NULL);
141 if (IS_ERR(clk)) { 134 if (IS_ERR(clk)) {