Message ID | 1411429748-31444-1-git-send-email-soren.brinkmann@xilinx.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On 23/09/2014 01:49, Soren Brinkmann : > 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. > --- > Hi, > > I might be mistaken, but I think the driver core does already take care of > calling into the pinctrl framework and the driver does not need to do it on its > own (drivers/base/dd.c:really_probe() calls 'pinctrl_bind_pins() which takes > care of the pinctrl setup). True, thanks for your patch: Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > drivers/net/ethernet/cadence/macb.c | 11 ----------- > 1 file changed, 11 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c > index ca5d7798b265..e1e02fba4fcc 100644 > --- 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" > > @@ -2071,7 +2070,6 @@ static int __init macb_probe(struct platform_device *pdev) > struct phy_device *phydev; > u32 config; > int err = -ENXIO; > - struct pinctrl *pinctrl; > const char *mac; > > regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); > @@ -2080,15 +2078,6 @@ static int __init macb_probe(struct platform_device *pdev) > 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) >
From: Soren Brinkmann <soren.brinkmann@xilinx.com> Date: Mon, 22 Sep 2014 16:49:08 -0700 > 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. > --- > Hi, > > I might be mistaken, but I think the driver core does already take care of > calling into the pinctrl framework and the driver does not need to do it on its > own (drivers/base/dd.c:really_probe() calls 'pinctrl_bind_pins() which takes > care of the pinctrl setup). > Applied and queued up for -stable, thanks. Next time please provide a proper "Signed-off-by: " in the commit message of your submission. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2014-09-26 at 03:49PM -0400, David Miller wrote: > From: Soren Brinkmann <soren.brinkmann@xilinx.com> > Date: Mon, 22 Sep 2014 16:49:08 -0700 > > > 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. > > --- > > Hi, > > > > I might be mistaken, but I think the driver core does already take care of > > calling into the pinctrl framework and the driver does not need to do it on its > > own (drivers/base/dd.c:really_probe() calls 'pinctrl_bind_pins() which takes > > care of the pinctrl setup). > > > > Applied and queued up for -stable, thanks. thx > Next time please provide a proper "Signed-off-by: " in the commit message > of your submission. Yeah, sorry for that. I overlooked that one. My alias for commit takes care of this, but I don't have that for revert. In case you need it: Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Sören -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index ca5d7798b265..e1e02fba4fcc 100644 --- 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" @@ -2071,7 +2070,6 @@ static int __init macb_probe(struct platform_device *pdev) struct phy_device *phydev; u32 config; int err = -ENXIO; - struct pinctrl *pinctrl; const char *mac; regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -2080,15 +2078,6 @@ static int __init macb_probe(struct platform_device *pdev) 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)