diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2013-07-10 11:57:43 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-07-11 20:18:26 -0400 |
commit | 54842ec2b0644b3e04c6fcfb52bc94dfcf918a43 (patch) | |
tree | dc9e7c72084aef21c2be09f803ee677ff8f9c2ab | |
parent | d25903f894849fa799141e774c4ad34199e3e6a1 (diff) |
drivers/net/ethernet/cadence: 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: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/cadence/at91_ether.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c index 3f1957158a3b..bb5d63fb2e6d 100644 --- a/drivers/net/ethernet/cadence/at91_ether.c +++ b/drivers/net/ethernet/cadence/at91_ether.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include <linux/of.h> | 29 | #include <linux/of.h> |
30 | #include <linux/of_device.h> | 30 | #include <linux/of_device.h> |
31 | #include <linux/of_net.h> | 31 | #include <linux/of_net.h> |
32 | #include <linux/pinctrl/consumer.h> | ||
33 | 32 | ||
34 | #include "macb.h" | 33 | #include "macb.h" |
35 | 34 | ||
@@ -309,7 +308,6 @@ static int __init at91ether_probe(struct platform_device *pdev) | |||
309 | struct resource *regs; | 308 | struct resource *regs; |
310 | struct net_device *dev; | 309 | struct net_device *dev; |
311 | struct phy_device *phydev; | 310 | struct phy_device *phydev; |
312 | struct pinctrl *pinctrl; | ||
313 | struct macb *lp; | 311 | struct macb *lp; |
314 | int res; | 312 | int res; |
315 | u32 reg; | 313 | u32 reg; |
@@ -319,15 +317,6 @@ static int __init at91ether_probe(struct platform_device *pdev) | |||
319 | if (!regs) | 317 | if (!regs) |
320 | return -ENOENT; | 318 | return -ENOENT; |
321 | 319 | ||
322 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | ||
323 | if (IS_ERR(pinctrl)) { | ||
324 | res = PTR_ERR(pinctrl); | ||
325 | if (res == -EPROBE_DEFER) | ||
326 | return res; | ||
327 | |||
328 | dev_warn(&pdev->dev, "No pinctrl provided\n"); | ||
329 | } | ||
330 | |||
331 | dev = alloc_etherdev(sizeof(struct macb)); | 320 | dev = alloc_etherdev(sizeof(struct macb)); |
332 | if (!dev) | 321 | if (!dev) |
333 | return -ENOMEM; | 322 | return -ENOMEM; |