Skip to contentSkip to conversation

gpio: ts4800: Remove duplicate code to handle 'ngpios' property

PATCH Applied Andy Shevchenko 3 participants 3 messages Feb 19 – Feb 23 GPIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gpio: ts4800: Remove duplicate code to handle 'ngpios' property

The gpio_generic_chip_init() handles the 'ngpios' property and assigns the respective field in struct gpio_chip either with the value of it, or, if not found, with the default based on the register size. There is no need to repeat this in the driver.

---
 drivers/gpio/gpio-ts4800.c | 10 ----------
 1 file changed, 10 deletions(-)
drivers/gpio/gpio-ts4800.c +0 -10
index 992ee231db9f..0207c2b813f4 100644
@@ -11,7 +11,6 @@
 #include <linux/platform_device.h>
 #include <linux/property.h>
 
-#define DEFAULT_PIN_NUMBER      16
 #define INPUT_REG_OFFSET        0x00
 #define OUTPUT_REG_OFFSET       0x02
 #define DIRECTION_REG_OFFSET    0x04
@@ -23,7 +22,6 @@ static int ts4800_gpio_probe(struct platform_device *pdev)
 	struct gpio_generic_chip *chip;
 	void __iomem *base_addr;
 	int retval;
-	u32 ngpios;
 
 	chip = devm_kzalloc(dev, sizeof(*chip), GFP_KERNEL);
 	if (!chip)
@@ -33,12 +31,6 @@ static int ts4800_gpio_probe(struct platform_device *pdev)
 	if (IS_ERR(base_addr))
 		return PTR_ERR(base_addr);
 
-	retval = device_property_read_u32(dev, "ngpios", &ngpios);
-	if (retval == -EINVAL)
-		ngpios = DEFAULT_PIN_NUMBER;
-	else if (retval)
-		return retval;
-
 	config = (struct gpio_generic_chip_config) {
 		.dev = dev,
 		.sz = 2,
@@ -52,8 +44,6 @@ static int ts4800_gpio_probe(struct platform_device *pdev)
 		return dev_err_probe(dev, retval,
 				     "failed to initialize the generic GPIO chip\n");
 
-	chip->gc.ngpio = ngpios;
-
 	return devm_gpiochip_add_data(dev, &chip->gc, NULL);
 }
 
Signature · 1 line
2.50.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Andy Shevchenko

The gpio_generic_chip_init() handles the 'ngpios' property and assigns the respective field in struct gpio_chip either with the value of it, or, if not found, with the default based on the register size. There is no need to repeat this in the driver.

That's right.

Yours,
Linus Walleij

#2 lore raw
In reply to Andy Shevchenko
Quoted 6 lines · Andy Shevchenko

The gpio_generic_chip_init() handles the 'ngpios' property and assigns the respective field in struct gpio_chip either with the value of it, or, if not found, with the default based on the register size. There is no need to repeat this in the driver.

Applied, thanks!

[1/1] gpio: ts4800: Remove duplicate code to handle 'ngpios' property

      https://git.kernel.org/brgl/c/0acbe817c37344f10cb413663be494ad66bf40bc

Best regards,

Signature · 1 line
Bartosz Golaszewski <[email protected]>