Hello,
now that all patches that were in next hit Linus Torvalds' tree and v4.2-rc1 is out here comes the promised pull request that makes usage of the flags parameter mandatory for gpiod_get et al:
The following changes since commit d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754:
Linux 4.2-rc1 (2015-07-05 11:01:52 -0700)
are available in the git repository at:
git://git.pengutronix.de/git/ukl/linux.git tags/gpiod-flags-for-4.3
for you to fetch changes up to b17d1bf16cc72a374a48d748940f700009d40ff4:
gpio: make flags mandatory for gpiod_get functions (2015-07-06 10:39:24 +0200)
---------------------------------------------------------------- The last patch in this series makes the flags parameter for the various gpiod_get* functions mandatory and so allows to remove an ugly cpp hack introduced in commit 39b2bbe3d715 (gpio: add flags argument to gpiod_get*() functions) for v3.17-rc1.
The other nine commits fix the last remaining users of these functions that don't pass flags yet. (Only etraxfs-uart wasn't fixed; this driver's use of the gpiod functions needs fixing anyhow.)
----------------------------------------------------------------
According to the coccinelle-script I wrote all users (apart from etraxfs-uart) are fixed now.
As some of the maintainers requested it, I'll resend the patches contained in this series as a reply to this mail.
It would be great if this could be put into next via the gpio tree to give new users enough time to adapt their patches.
Thanks Uwe
Uwe Kleine-König (10): drm/msm/dp: use flags argument of devm_gpiod_get to set direction drm/tilcdc: panel: make better use of gpiod API iio: light: stk3310: use flags argument of devm_gpiod_get iio: magn: bmc150: use flags argument of devm_gpiod_get media: i2c/adp1653: set enable gpio to output NFC: nxp-nci_i2c: use flags argument of devm_gpiod_get_index phy: tusb1210: make better use of gpiod API usb: dwc3: pci: make better use of gpiod API usb: pass flags parameter to gpiod_get functions gpio: make flags mandatory for gpiod_get functions
drivers/gpio/devres.c | 18 ++++---- drivers/gpio/gpiolib.c | 16 +++---- drivers/gpu/drm/msm/edp/edp_ctrl.c | 17 +------ drivers/gpu/drm/tilcdc/tilcdc_panel.c | 22 +++------ drivers/iio/light/stk3310.c | 6 +-- drivers/iio/magnetometer/bmc150_magn.c | 6 +-- drivers/media/i2c/adp1653.c | 2 +- drivers/nfc/nxp-nci/i2c.c | 10 ++--- drivers/phy/phy-tusb1210.c | 30 +++++-------- drivers/usb/dwc3/dwc3-pci.c | 26 ++++++----- drivers/usb/gadget/udc/pxa27x_udc.c | 2 +- drivers/usb/phy/phy-generic.c | 6 ++- include/linux/gpio/consumer.h | 82 ++++++++++------------------------ 13 files changed, 88 insertions(+), 155 deletions(-)
Since 39b2bbe3d715 (gpio: add flags argument to gpiod_get*() functions) which appeared in v3.17-rc1, the gpiod_get* functions take an additional parameter that allows to specify direction and initial value for output.
Use this to simplify the driver. Furthermore this is one caller less that stops us making the flags argument to gpiod_get*() mandatory.
Acked-by: Alexandre Courbot acourbot@nvidia.com Acked-by: Linus Walleij linus.walleij@linaro.org Signed-off-by: Uwe Kleine-König u.kleine-koenig@pengutronix.de --- drivers/gpu/drm/msm/edp/edp_ctrl.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/msm/edp/edp_ctrl.c b/drivers/gpu/drm/msm/edp/edp_ctrl.c index 7991069dd492..81200e9be382 100644 --- a/drivers/gpu/drm/msm/edp/edp_ctrl.c +++ b/drivers/gpu/drm/msm/edp/edp_ctrl.c @@ -373,7 +373,7 @@ static int edp_gpio_config(struct edp_ctrl *ctrl) struct device *dev = &ctrl->pdev->dev; int ret;
- ctrl->panel_hpd_gpio = devm_gpiod_get(dev, "panel-hpd"); + ctrl->panel_hpd_gpio = devm_gpiod_get(dev, "panel-hpd", GPIOD_IN); if (IS_ERR(ctrl->panel_hpd_gpio)) { ret = PTR_ERR(ctrl->panel_hpd_gpio); ctrl->panel_hpd_gpio = NULL; @@ -381,13 +381,7 @@ static int edp_gpio_config(struct edp_ctrl *ctrl) return ret; }
- ret = gpiod_direction_input(ctrl->panel_hpd_gpio); - if (ret) { - pr_err("%s: Set direction for hpd failed, %d\n", __func__, ret); - return ret; - } - - ctrl->panel_en_gpio = devm_gpiod_get(dev, "panel-en"); + ctrl->panel_en_gpio = devm_gpiod_get(dev, "panel-en", GPIOD_OUT_LOW); if (IS_ERR(ctrl->panel_en_gpio)) { ret = PTR_ERR(ctrl->panel_en_gpio); ctrl->panel_en_gpio = NULL; @@ -395,13 +389,6 @@ static int edp_gpio_config(struct edp_ctrl *ctrl) return ret; }
- ret = gpiod_direction_output(ctrl->panel_en_gpio, 0); - if (ret) { - pr_err("%s: Set direction for panel_en failed, %d\n", - __func__, ret); - return ret; - } - DBG("gpio on");
return 0;
Since 39b2bbe3d715 (gpio: add flags argument to gpiod_get*() functions) which appeared in v3.17-rc1, the gpiod_get* functions take an additional parameter that allows to specify direction and initial value for output.
Furthermore there is devm_gpiod_get_optional which is designed to get optional gpios.
Simplify driver accordingly.
Acked-by: Alexandre Courbot acourbot@nvidia.com Acked-by: Linus Walleij linus.walleij@linaro.org Signed-off-by: Uwe Kleine-König u.kleine-koenig@pengutronix.de --- drivers/gpu/drm/tilcdc/tilcdc_panel.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c index 7a0315855e90..0af8bed7ce1e 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c @@ -375,25 +375,17 @@ static int panel_probe(struct platform_device *pdev) dev_info(&pdev->dev, "found backlight\n"); }
- panel_mod->enable_gpio = devm_gpiod_get(&pdev->dev, "enable"); + panel_mod->enable_gpio = devm_gpiod_get_optional(&pdev->dev, "enable", + GPIOD_OUT_LOW); if (IS_ERR(panel_mod->enable_gpio)) { ret = PTR_ERR(panel_mod->enable_gpio); - if (ret != -ENOENT) { - dev_err(&pdev->dev, "failed to request enable GPIO\n"); - goto fail_backlight; - } - - /* Optional GPIO is not here, continue silently. */ - panel_mod->enable_gpio = NULL; - } else { - ret = gpiod_direction_output(panel_mod->enable_gpio, 0); - if (ret < 0) { - dev_err(&pdev->dev, "failed to setup GPIO\n"); - goto fail_backlight; - } - dev_info(&pdev->dev, "found enable GPIO\n"); + dev_err(&pdev->dev, "failed to request enable GPIO\n"); + goto fail_backlight; }
+ if (panel_mod->enable_gpio) + dev_info(&pdev->dev, "found enable GPIO\n"); + mod = &panel_mod->base; pdev->dev.platform_data = mod;
dri-devel@lists.freedesktop.org
-
Uwe Kleine-König