]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
drivers/net/ethernet/cadence: don't use devm_pinctrl_get_select_default() in probe
authorWolfram Sang <wsa@the-dreams.de>
Wed, 10 Jul 2013 15:57:43 +0000 (16:57 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 12 Jul 2013 00:18:26 +0000 (17:18 -0700)
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>
drivers/net/ethernet/cadence/at91_ether.c

index 3f1957158a3bc876839d0613f1cbb0e7079687a5..bb5d63fb2e6d7b9566dfcdd6bcc2de6bd831b8d9 100644 (file)
@@ -29,7 +29,6 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_net.h>
-#include <linux/pinctrl/consumer.h>
 
 #include "macb.h"
 
@@ -309,7 +308,6 @@ static int __init at91ether_probe(struct platform_device *pdev)
        struct resource *regs;
        struct net_device *dev;
        struct phy_device *phydev;
-       struct pinctrl *pinctrl;
        struct macb *lp;
        int res;
        u32 reg;
@@ -319,15 +317,6 @@ static int __init at91ether_probe(struct platform_device *pdev)
        if (!regs)
                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));
        if (!dev)
                return -ENOMEM;