Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88167fc0 authored Jul 06, 2015 by Uwe Kleine-König Committed by Felipe Balbi Jul 29, 2015

usb: pass flags parameter to gpiod_get functions



Since 39b2bbe3 (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>

parent 2df033ca

drivers/usb/gadget/udc/pxa27x_udc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

drivers/usb/phy/phy-generic.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -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) {