usb: pass flags parameter to gpiod_get functions

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.

Currently this parameter is made optional with the help of a cpp trick.
To allow dropping this hack convert callers to explictly pass a value
for flags.

Acked-by: Felipe Balbi <balbi@ti.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>

2 files changed, 5 insertions, 3 deletions

diff --git a/drivers/usb/gadget/udc/pxa27x_udc.c b/drivers/usb/gadget/udc/pxa27x_udc.c
index b51226abade6..042f06b52677 100644
--- a/drivers/usb/gadget/udc/pxa27x_udc.c
+++ b/drivers/usb/gadget/udc/pxa27x_udc.c
@@ -2422,7 +2422,7 @@ static int pxa_udc_probe(struct platform_device *pdev)
                 }
                 udc->udc_command = mach->udc_command;
         } else {
-                udc->gpiod = devm_gpiod_get(&pdev->dev, NULL);
+                udc->gpiod = devm_gpiod_get(&pdev->dev, NULL, GPIOD_ASIS);
         }
 
         regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c
index deee68eafb72..ec6ecd03269c 100644
--- a/drivers/usb/phy/phy-generic.c
+++ b/drivers/usb/phy/phy-generic.c
@@ -218,11 +218,13 @@ int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_generic *nop,
                         clk_rate = 0;
 
                 needs_vcc = of_property_read_bool(node, "vcc-supply");
-                nop->gpiod_reset = devm_gpiod_get_optional(dev, "reset");
+                nop->gpiod_reset = devm_gpiod_get_optional(dev, "reset",
+                                                           GPIOD_ASIS);
                 err = PTR_ERR_OR_ZERO(nop->gpiod_reset);
                 if (!err) {
                         nop->gpiod_vbus = devm_gpiod_get_optional(dev,
-                                                         "vbus-detect");
+                                                         "vbus-detect",
+                                                         GPIOD_ASIS);
                         err = PTR_ERR_OR_ZERO(nop->gpiod_vbus);
                 }
         } else if (pdata) {