提交 54842ec2 编写于 作者: W Wolfram Sang 提交者: David S. Miller

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

Since commit ab78029e (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: NWolfram Sang <wsa@the-dreams.de>
Acked-by: NNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 d25903f8
...@@ -29,7 +29,6 @@ ...@@ -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) ...@@ -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) ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册