Commit f0254b51 authored by Thierry Reding's avatar Thierry Reding Committed by Linus Walleij
Browse files

gpio: Unconditionally assign .request()/.free() 



The gpiochip_generic_request() and gpiochip_generic_free() functions can
now deal properly with chips that don't have any pin-ranges defined, so
they can be assigned unconditionally.

Suggested-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20200401200527.2982450-1-thierry.reding@gmail.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 33dd8882

drivers/gpio/gpio-davinci.c

+2 −5
Original line number Diff line number Diff line
@@ -259,11 +259,8 @@ static int davinci_gpio_probe(struct platform_device *pdev) 
	chips->chip.of_gpio_n_cells = 2;

	chips->chip.parent = dev;

	chips->chip.of_node = dev->of_node;



	if (of_property_read_bool(dev->of_node, "gpio-ranges")) {

	chips->chip.request = gpiochip_generic_request;

	chips->chip.free = gpiochip_generic_free;

	}

#endif

	spin_lock_init(&chips->lock);

drivers/gpio/gpio-mxc.c

+2 −5
Original line number Diff line number Diff line
@@ -485,11 +485,8 @@ static int mxc_gpio_probe(struct platform_device *pdev) 
	if (err)

		goto out_bgio;



	if (of_property_read_bool(np, "gpio-ranges")) {

	port->gc.request = gpiochip_generic_request;

	port->gc.free = gpiochip_generic_free;

	}



	port->gc.to_irq = mxc_gpio_to_irq;

	port->gc.base = (pdev->id < 0) ? of_alias_get_id(np, "gpio") * 32 :

					     pdev->id * 32;

drivers/gpio/gpio-pl061.c

+2 −5
Original line number Diff line number Diff line
@@ -298,11 +298,8 @@ static int pl061_probe(struct amba_device *adev, const struct amba_id *id) 
		return PTR_ERR(pl061->base);



	raw_spin_lock_init(&pl061->lock);

	if (of_property_read_bool(dev->of_node, "gpio-ranges")) {

	pl061->gc.request = gpiochip_generic_request;

	pl061->gc.free = gpiochip_generic_free;

	}



	pl061->gc.base = -1;

	pl061->gc.get_direction = pl061_get_direction;

	pl061->gc.direction_input = pl061_direction_input;

drivers/gpio/gpio-pxa.c

+2 −5
Original line number Diff line number Diff line
@@ -361,11 +361,8 @@ static int pxa_init_gpio_chip(struct pxa_gpio_chip *pchip, int ngpio, 
	pchip->chip.set = pxa_gpio_set;

	pchip->chip.to_irq = pxa_gpio_to_irq;

	pchip->chip.ngpio = ngpio;



	if (pxa_gpio_has_pinctrl()) {

	pchip->chip.request = gpiochip_generic_request;

	pchip->chip.free = gpiochip_generic_free;

	}



#ifdef CONFIG_OF_GPIO

	pchip->chip.of_node = np;

drivers/gpio/gpio-zx.c

+4 −6
Original line number Diff line number Diff line
@@ -226,13 +226,11 @@ static int zx_gpio_probe(struct platform_device *pdev) 
	if (IS_ERR(chip->base))

		return PTR_ERR(chip->base);



	id = of_alias_get_id(dev->of_node, "gpio");



	raw_spin_lock_init(&chip->lock);

	if (of_property_read_bool(dev->of_node, "gpio-ranges")) {

	chip->gc.request = gpiochip_generic_request;

	chip->gc.free = gpiochip_generic_free;

	}



	id = of_alias_get_id(dev->of_node, "gpio");

	chip->gc.direction_input = zx_direction_input;

	chip->gc.direction_output = zx_direction_output;

	chip->gc.get = zx_get_value;

CRA Git | Maintained and supported by SUSTech CRA and CCSE