| Message ID | 1360442671-15216-3-git-send-email-javier.martinez@collabora.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, Feb 9, 2013 at 9:44 PM, Javier Martinez Canillas <javier.martinez@collabora.co.uk> wrote: > If no pinctrl is available just report a warning since > it may not needed in some cases (e.g: non-DT kernels). > > Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> (...) > + struct pinctrl *pinctrl; (...) > + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); > + if (IS_ERR(pinctrl)) { > + retval = PTR_ERR(pinctrl); > + if (retval == -EPROBE_DEFER) > + goto out_0; > + > + dev_warn(&pdev->dev, "No pinctrl provided\n"); > + } NACK. This will be handled from the device core after the v3.9 merge window. See: http://marc.info/?l=linux-kernel&m=135887740715083&w=2 Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Feb 11, 2013 at 3:23 PM, Linus Walleij <linus.walleij@linaro.org> wrote: > On Sat, Feb 9, 2013 at 9:44 PM, Javier Martinez Canillas > <javier.martinez@collabora.co.uk> wrote: > >> If no pinctrl is available just report a warning since >> it may not needed in some cases (e.g: non-DT kernels). >> >> Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> > (...) >> + struct pinctrl *pinctrl; > (...) >> + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); >> + if (IS_ERR(pinctrl)) { >> + retval = PTR_ERR(pinctrl); >> + if (retval == -EPROBE_DEFER) >> + goto out_0; >> + >> + dev_warn(&pdev->dev, "No pinctrl provided\n"); >> + } > > NACK. > > This will be handled from the device core after the v3.9 merge > window. > > See: > http://marc.info/?l=linux-kernel&m=135887740715083&w=2 > Great, I also wondered why it couldn't be part of the device core since we basically duplicate this in all the DT aware drivers and pinctrl was not used anywhere after setting to its default state. This is a nice improvement. > Yours, > Linus Walleij > -- Thanks a lot and best regards, Javier -- To unsubscribe from this list: send the line "unsubscribe linux-omap" 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/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index e112877..40766c7 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c @@ -59,6 +59,7 @@ #include <linux/of_device.h> #include <linux/of_gpio.h> #include <linux/of_net.h> +#include <linux/pinctrl/consumer.h> #include "smsc911x.h" #define SMSC_CHIPNAME "smsc911x" @@ -2352,6 +2353,7 @@ static int smsc911x_drv_probe(struct platform_device *pdev) struct smsc911x_data *pdata; struct smsc911x_platform_config *config = pdev->dev.platform_data; struct resource *res, *irq_res; + struct pinctrl *pinctrl; unsigned int intcfg = 0; int res_size, irq_flags; int retval; @@ -2381,6 +2383,15 @@ static int smsc911x_drv_probe(struct platform_device *pdev) goto out_0; } + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); + if (IS_ERR(pinctrl)) { + retval = PTR_ERR(pinctrl); + if (retval == -EPROBE_DEFER) + goto out_0; + + dev_warn(&pdev->dev, "No pinctrl provided\n"); + } + dev = alloc_etherdev(sizeof(struct smsc911x_data)); if (!dev) { retval = -ENOMEM;
If no pinctrl is available just report a warning since it may not needed in some cases (e.g: non-DT kernels). Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> --- drivers/net/ethernet/smsc/smsc911x.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)