gpio: Unconditionally assign .request()/.free()
Subsystems (6)
PATCH 1/2 gpio: Unconditionally assign .request()/.free()
From: Thierry Reding <[email protected]>
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.
--- drivers/gpio/gpio-davinci.c | 7 ++----- drivers/gpio/gpio-mxc.c | 7 ++----- drivers/gpio/gpio-pl061.c | 7 ++----- drivers/gpio/gpio-pxa.c | 7 ++----- drivers/gpio/gpio-zx.c | 10 ++++------ 5 files changed, 12 insertions(+), 26 deletions(-)
drivers/gpio/gpio-davinci.c +2 -5
@@ -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; - } + 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
@@ -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.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
@@ -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.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
@@ -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; - } + 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
@@ -226,13 +226,11 @@ static int zx_gpio_probe(struct platform_device *pdev)if (IS_ERR (chip->base))return PTR_ERR (chip->base); -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" ); + +raw_spin_lock_init (&chip->lock); + chip->gc.request = gpiochip_generic_request; + chip->gc.free = gpiochip_generic_free; chip->gc.direction_input = zx_direction_input; chip->gc.direction_output = zx_direction_output; chip->gc.get = zx_get_value;
Signature · 1 line
2.24.1
PATCH 2/2 pinctrl: Unconditionally assign .request()/.free()
From: Thierry Reding <[email protected]>
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.
--- drivers/pinctrl/pinctrl-ingenic.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/pinctrl/pinctrl-ingenic.c +2 -5
@@ -2323,11 +2323,8 @@ static int __init ingenic_gpio_probe(struct ingenic_pinctrl *jzpc, jzgc->gc.direction_input = ingenic_gpio_direction_input; jzgc->gc.direction_output = ingenic_gpio_direction_output; jzgc->gc.get_direction = ingenic_gpio_get_direction; - -if (of_property_read_bool (node,"gpio-ranges" )) { - jzgc->gc.request = gpiochip_generic_request; - jzgc->gc.free = gpiochip_generic_free; - } + jzgc->gc.request = gpiochip_generic_request; + jzgc->gc.free = gpiochip_generic_free; jzgc->irq =irq_of_parse_and_map (node,0 );if (!jzgc->irq)
Signature · 1 line
2.24.1
Re: [PATCH 2/2] pinctrl: Unconditionally assign .request()/.free()
Quoted 8 lines · Thierry Reding
From: Thierry Reding <[email protected]>
The
gpiochip_generic_request()andgpiochip_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]>
Patch applied.
Yours,
Linus Walleij
Quoted 8 lines · Thierry Reding
From: Thierry Reding <[email protected]>
The
gpiochip_generic_request()andgpiochip_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]>
Patch applied.
Yours,
Linus Walleij