lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/net/ethernet/cadence: don't use devm_pinctrl_get_select_default() in probe

Browse Source 
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>
This commit is contained in:
Wolfram Sang
2013-07-10 16:57:43 +01:00
committed by David S. Miller
parent d25903f894
commit 54842ec2b0
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/ethernet/cadence/at91_ether.c
View File

@@ -29,7 +29,6 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_net.h> #include <linux/of_net.h>
#include <linux/pinctrl/consumer.h>
#include "macb.h" #include "macb.h"
@@ -309,7 +308,6 @@ static int __init at91ether_probe(struct platform_device *pdev)
struct resource *regs; struct resource *regs;
struct net_device *dev; struct net_device *dev;
struct phy_device *phydev; struct phy_device *phydev;
struct pinctrl *pinctrl;
struct macb *lp; struct macb *lp;
int res; int res;
u32 reg; u32 reg;
@@ -319,15 +317,6 @@ static int __init at91ether_probe(struct platform_device *pdev)
if (!regs) if (!regs)
return -ENOENT; return -ENOENT;
pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
if (IS_ERR(pinctrl)) {
res = PTR_ERR(pinctrl);
if (res == -EPROBE_DEFER)
return res;
dev_warn(&pdev->dev, "No pinctrl provided\n");
}
dev = alloc_etherdev(sizeof(struct macb)); dev = alloc_etherdev(sizeof(struct macb));
if (!dev) if (!dev)
return -ENOMEM; return -ENOMEM;