Skip to content

Commit f0254b5

Browse files
thierryredinglinusw
authored andcommitted
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: Linus Walleij <[email protected]> Signed-off-by: Thierry Reding <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Linus Walleij <[email protected]>
1 parent 33dd888 commit f0254b5

File tree

5 files changed

+12
-26
lines changed

5 files changed

+12
-26
lines changed

drivers/gpio/gpio-davinci.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,11 +259,8 @@ static int davinci_gpio_probe(struct platform_device *pdev)
259259
chips->chip.of_gpio_n_cells = 2;
260260
chips->chip.parent = dev;
261261
chips->chip.of_node = dev->of_node;
262-
263-
if (of_property_read_bool(dev->of_node, "gpio-ranges")) {
264-
chips->chip.request = gpiochip_generic_request;
265-
chips->chip.free = gpiochip_generic_free;
266-
}
262+
chips->chip.request = gpiochip_generic_request;
263+
chips->chip.free = gpiochip_generic_free;
267264
#endif
268265
spin_lock_init(&chips->lock);
269266

drivers/gpio/gpio-mxc.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -485,11 +485,8 @@ static int mxc_gpio_probe(struct platform_device *pdev)
485485
if (err)
486486
goto out_bgio;
487487

488-
if (of_property_read_bool(np, "gpio-ranges")) {
489-
port->gc.request = gpiochip_generic_request;
490-
port->gc.free = gpiochip_generic_free;
491-
}
492-
488+
port->gc.request = gpiochip_generic_request;
489+
port->gc.free = gpiochip_generic_free;
493490
port->gc.to_irq = mxc_gpio_to_irq;
494491
port->gc.base = (pdev->id < 0) ? of_alias_get_id(np, "gpio") * 32 :
495492
pdev->id * 32;

drivers/gpio/gpio-pl061.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -298,11 +298,8 @@ static int pl061_probe(struct amba_device *adev, const struct amba_id *id)
298298
return PTR_ERR(pl061->base);
299299

300300
raw_spin_lock_init(&pl061->lock);
301-
if (of_property_read_bool(dev->of_node, "gpio-ranges")) {
302-
pl061->gc.request = gpiochip_generic_request;
303-
pl061->gc.free = gpiochip_generic_free;
304-
}
305-
301+
pl061->gc.request = gpiochip_generic_request;
302+
pl061->gc.free = gpiochip_generic_free;
306303
pl061->gc.base = -1;
307304
pl061->gc.get_direction = pl061_get_direction;
308305
pl061->gc.direction_input = pl061_direction_input;

drivers/gpio/gpio-pxa.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -361,11 +361,8 @@ static int pxa_init_gpio_chip(struct pxa_gpio_chip *pchip, int ngpio,
361361
pchip->chip.set = pxa_gpio_set;
362362
pchip->chip.to_irq = pxa_gpio_to_irq;
363363
pchip->chip.ngpio = ngpio;
364-
365-
if (pxa_gpio_has_pinctrl()) {
366-
pchip->chip.request = gpiochip_generic_request;
367-
pchip->chip.free = gpiochip_generic_free;
368-
}
364+
pchip->chip.request = gpiochip_generic_request;
365+
pchip->chip.free = gpiochip_generic_free;
369366

370367
#ifdef CONFIG_OF_GPIO
371368
pchip->chip.of_node = np;

drivers/gpio/gpio-zx.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,13 +226,11 @@ static int zx_gpio_probe(struct platform_device *pdev)
226226
if (IS_ERR(chip->base))
227227
return PTR_ERR(chip->base);
228228

229-
raw_spin_lock_init(&chip->lock);
230-
if (of_property_read_bool(dev->of_node, "gpio-ranges")) {
231-
chip->gc.request = gpiochip_generic_request;
232-
chip->gc.free = gpiochip_generic_free;
233-
}
234-
235229
id = of_alias_get_id(dev->of_node, "gpio");
230+
231+
raw_spin_lock_init(&chip->lock);
232+
chip->gc.request = gpiochip_generic_request;
233+
chip->gc.free = gpiochip_generic_free;
236234
chip->gc.direction_input = zx_direction_input;
237235
chip->gc.direction_output = zx_direction_output;
238236
chip->gc.get = zx_get_value;

0 commit comments

Comments
 (0)