| From foo@baz Sun Oct 12 20:11:55 CEST 2014 |
| From: Soren Brinkmann <soren.brinkmann@xilinx.com> |
| Date: Mon, 22 Sep 2014 16:49:08 -0700 |
| Subject: Revert "net/macb: add pinctrl consumer support" |
| |
| From: Soren Brinkmann <soren.brinkmann@xilinx.com> |
| |
| [ Upstream commit 9026968abe7ad102f4ac5c6d96d733643f75399c ] |
| |
| This reverts commit 8ef29f8aae524bd51298fb10ac6a5ce6c4c5a3d8. |
| The driver core already calls pinctrl_get() and claims the default |
| state. There is no need to replicate this in the driver. |
| Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> |
| |
| Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/cadence/macb.c | 11 ----------- |
| 1 file changed, 11 deletions(-) |
| |
| --- a/drivers/net/ethernet/cadence/macb.c |
| +++ b/drivers/net/ethernet/cadence/macb.c |
| @@ -30,7 +30,6 @@ |
| #include <linux/of_device.h> |
| #include <linux/of_mdio.h> |
| #include <linux/of_net.h> |
| -#include <linux/pinctrl/consumer.h> |
| |
| #include "macb.h" |
| |
| @@ -1803,7 +1802,6 @@ static int __init macb_probe(struct plat |
| struct phy_device *phydev; |
| u32 config; |
| int err = -ENXIO; |
| - struct pinctrl *pinctrl; |
| const char *mac; |
| |
| regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| @@ -1812,15 +1810,6 @@ static int __init macb_probe(struct plat |
| goto err_out; |
| } |
| |
| - pinctrl = devm_pinctrl_get_select_default(&pdev->dev); |
| - if (IS_ERR(pinctrl)) { |
| - err = PTR_ERR(pinctrl); |
| - if (err == -EPROBE_DEFER) |
| - goto err_out; |
| - |
| - dev_warn(&pdev->dev, "No pinctrl provided\n"); |
| - } |
| - |
| err = -ENOMEM; |
| dev = alloc_etherdev(sizeof(*bp)); |
| if (!dev) |
