gpiolib: improve coding style for local variables
PATCH v4 1/2 gpiolib: improve coding style for local variables
Drop unneeded whitespaces and put the variables of the same type together for consistency with the rest of the code.
---
v1 -> v2:
- no changes
v2 -> v3:
- keep initializations on separate lines
v3 -> v4:
- no changes
drivers/gpio/gpiolib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpio/gpiolib.c +4 -4
@@ -594,11 +594,11 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, struct lock_class_key *request_key) {struct fwnode_handle *fwnode = gc->parent ?dev_fwnode (gc->parent) :NULL ; -unsigned long flags; -int ret =0 ; -unsigned i; -int base = gc->base;struct gpio_device *gdev; +unsigned long flags; +int base = gc->base; +unsigned int i; +int ret =0 ;/* * First: allocate and populate the internal stat container, and
Signature · 1 line
2.25.1
PATCH v4 2/2 gpiolib: check the 'ngpios' property in core gpiolib code
Several drivers read the 'ngpios' device property on their own, but since it's defined as a standard GPIO property in the device tree bindings anyway, it's a good candidate for generalization. If the driver didn't set its gc->ngpio, try to read the 'ngpios' property from the GPIO device's firmware node before bailing out.
---
v1 -> v2:
- use device_property_read_u32() instead of fwnode_property_read_u32()
- reverse the error check logic
v2 -> v3:
- don't shadow errors other than -ENODATA in device_property_read_u32()
v3 -> v4:
- also make sure we return -EINVAL when the device 'ngpios' property is set to 0 (thanks Andy!)
drivers/gpio/gpiolib.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
drivers/gpio/gpiolib.c +21 -0
@@ -599,6 +599,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,int base = gc->base;unsigned int i;int ret =0 ; +u32 ngpios;/* * First: allocate and populate the internal stat container, and
@@ -646,6 +647,26 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, goto err_free_dev_name; } +/* +* Try the device properties if the driver didn't supply the number +* of GPIO lines. +*/ +if (gc->ngpio ==0 ) { + ret =device_property_read_u32 (&gdev->dev,"ngpios" , &ngpios); +if (ret == -ENODATA ) +/* +* -ENODATA means that there is no property found and +* we want to issue the error message to the user. +* Besides that, we want to return different error code +* to state that supplied value is not valid. +* */ + ngpios =0 ; +else if (ret) + goto err_free_descs; + + gc->ngpio = ngpios; + } +if (gc->ngpio ==0 ) {chip_err (gc,"tried to insert a GPIO chip with zero lines\n" ); ret = -EINVAL ;
Signature · 1 line
2.25.1
Re: [PATCH v4 2/2] gpiolib: check the 'ngpios' property in core gpiolib code
Quoted 5 lines · Bartosz Golaszewski
Several drivers read the 'ngpios' device property on their own, but since it's defined as a standard GPIO property in the device tree bindings anyway, it's a good candidate for generalization. If the driver didn't set its
gc->ngpio, try to read the 'ngpios' property from the GPIO device's firmware node before bailing out.
One nit-pick below (you may amend it when applying)
Quoted 38 lines
Signed-off-by Bartosz Golaszewski <[email protected]>Suggested-by Andy Shevchenko <[email protected]>Reviewed-by Linus Walleij <[email protected]>---
v1 -> v2:
- usedevice_property_read_u32()instead offwnode_property_read_u32()
- reverse the error check logicv2 -> v3:
- don't shadow errors other than-ENODATAindevice_property_read_u32()v3 -> v4:
- also make sure we return-EINVALwhen the device 'ngpios' property is set to 0 (thanks Andy!)drivers/gpio/gpiolib.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)drivers/gpio/gpiolib.c +5
-0@@ -599,6 +599,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,int base = gc->base;unsigned int i;int ret =0 ; +u32 ngpios;/* * First: allocate and populate the internal stat container, and @@ -646,6 +647,26 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, goto err_free_dev_name; } +/* +* Try the device properties if the driver didn't supply the number +* of GPIO lines. +*/
drivers/gpio/gpiolib.c int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, · line 663
Quoted 10 lines
drivers/gpio/gpiolib.c +9
-0+if (gc->ngpio ==0 ) { + ret =device_property_read_u32 (&gdev->dev,"ngpios" , &ngpios); +if (ret == -ENODATA ) +/* +* -ENODATA means that there is no property found and +* we want to issue the error message to the user. +* Besides that, we want to return different error code +* to state that supplied value is not valid. +* */
First '* ' is not needed.
Quoted 13 lines
drivers/gpio/gpiolib.c +7
-0+ ngpios =0 ; + else if (ret) + goto err_free_descs; + + gc->ngpio = ngpios; + } +if (gc->ngpio ==0 ) {chip_err (gc,"tried to insert a GPIO chip with zero lines\n" );ret =
-EINVAL;Signature · 1 line
2.25.1
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v4 2/2] gpiolib: check the 'ngpios' property in core gpiolib code
Quoted 58 lines · Andy Shevchenko
Quoted 5 lines · Bartosz Golaszewski
Several drivers read the 'ngpios' device property on their own, but since it's defined as a standard GPIO property in the device tree bindings anyway, it's a good candidate for generalization. If the driver didn't set its
gc->ngpio, try to read the 'ngpios' property from the GPIO device's firmware node before bailing out.Reviewed-by Andy Shevchenko <[email protected]>One nit-pick below (you may amend it when applying)
Quoted 46 lines
Signed-off-by Bartosz Golaszewski <[email protected]>Suggested-by Andy Shevchenko <[email protected]>Reviewed-by Linus Walleij <[email protected]>---
v1 -> v2:
- usedevice_property_read_u32()instead offwnode_property_read_u32()
- reverse the error check logicv2 -> v3:
- don't shadow errors other than-ENODATAindevice_property_read_u32()v3 -> v4:
- also make sure we return-EINVALwhen the device 'ngpios' property is set to 0 (thanks Andy!)drivers/gpio/gpiolib.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)drivers/gpio/gpiolib.c +13
-0@@ -599,6 +599,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,int base = gc->base;unsigned int i;int ret =0 ; +u32 ngpios;/* * First: allocate and populate the internal stat container, and @@ -646,6 +647,26 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, goto err_free_dev_name; } +/* +* Try the device properties if the driver didn't supply the number +* of GPIO lines. +*/ +if (gc->ngpio ==0 ) { + ret =device_property_read_u32 (&gdev->dev,"ngpios" , &ngpios); +if (ret == -ENODATA ) +/* +* -ENODATA means that there is no property found and +* we want to issue the error message to the user. +* Besides that, we want to return different error code +* to state that supplied value is not valid.
Quoted 4 lines
drivers/gpio/gpiolib.c int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, · line 662
Quoted 1 line
drivers/gpio/gpiolib.c +1
-0+* */ First '* ' is not needed.
I'll fix it when applying.
Bart
Re: [PATCH v4 2/2] gpiolib: check the 'ngpios' property in core gpiolib code
In reply to Bartosz GolaszewskiQuoted 65 lines · Bartosz Golaszewski
Several drivers read the 'ngpios' device property on their own, but since it's defined as a standard GPIO property in the device tree bindings anyway, it's a good candidate for generalization. If the driver didn't set its
gc->ngpio, try to read the 'ngpios' property from the GPIO device's firmware node before bailing out.Signed-off-by Bartosz Golaszewski <[email protected]>Suggested-by Andy Shevchenko <[email protected]>Reviewed-by Linus Walleij <[email protected]>---
v1 -> v2:
- usedevice_property_read_u32()instead offwnode_property_read_u32()
- reverse the error check logicv2 -> v3:
- don't shadow errors other than-ENODATAindevice_property_read_u32()v3 -> v4:
- also make sure we return-EINVALwhen the device 'ngpios' property is set to 0 (thanks Andy!)drivers/gpio/gpiolib.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)drivers/gpio/gpiolib.c +21
-1@@ -599,6 +599,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,int base = gc->base;unsigned int i;int ret =0 ; +u32 ngpios;/* * First: allocate and populate the internal stat container, and @@ -646,6 +647,26 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, goto err_free_dev_name; } +/* +* Try the device properties if the driver didn't supply the number +* of GPIO lines. +*/ +if (gc->ngpio ==0 ) { + ret =device_property_read_u32 (&gdev->dev,"ngpios" , &ngpios); +if (ret == -ENODATA ) +/* +* -ENODATA means that there is no property found and +* we want to issue the error message to the user. +* Besides that, we want to return different error code +* to state that supplied value is not valid. +* */ + ngpios =0 ; +else if (ret) + goto err_free_descs; + + gc->ngpio = ngpios; + } +if (gc->ngpio ==0 ) {chip_err (gc,"tried to insert a GPIO chip with zero lines\n" ); ret = -EINVAL ; --
Quoted 2 lines
2.25.1
Queued for next.
Bart
Quoted 41 lines · Bartosz Golaszewski
Drop unneeded whitespaces and put the variables of the same type together for consistency with the rest of the code.
Signed-off-by Bartosz Golaszewski <[email protected]>Reviewed-by Linus Walleij <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>---
v1 -> v2:
- no changesv2 -> v3:
- keep initializations on separate linesv3 -> v4:
- no changesdrivers/gpio/gpiolib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/gpio/gpiolib.c +4
-5@@ -594,11 +594,11 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, struct lock_class_key *request_key) {struct fwnode_handle *fwnode = gc->parent ?dev_fwnode (gc->parent) :NULL ; -unsigned long flags; -int ret =0 ; -unsigned i; -int base = gc->base;struct gpio_device *gdev; +unsigned long flags; +int base = gc->base; +unsigned int i; +int ret =0 ;/* * First: allocate and populate the internal stat container, and --
Quoted 2 lines
2.25.1
Queued for next.
Bart