leds: tca6507: do not set GPIO names
authorMarek Behún <marek.behun@nic.cz>
Sat, 19 Sep 2020 22:15:40 +0000 (00:15 +0200)
committerPavel Machek <pavel@ucw.cz>
Wed, 30 Sep 2020 17:15:41 +0000 (19:15 +0200)
Do not set GPIO names. Let gpiolib determine GPIO names from the DT
property `gpio-line-names`.

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Cc: NeilBrown <neilb@suse.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: H. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: Pavel Machek <pavel@ucw.cz>
drivers/leds/leds-tca6507.c

index d589c89930fdb1ba486b30db9fa9ad35f3d5c8db..5004278c6b991fd0b8dbf5f47611f41862d3d13e 100644 (file)
@@ -197,7 +197,6 @@ struct tca6507_chip {
        } leds[NUM_LEDS];
 #ifdef CONFIG_GPIOLIB
        struct gpio_chip                gpio;
-       const char                      *gpio_name[NUM_LEDS];
        int                             gpio_map[NUM_LEDS];
 #endif
 };
@@ -647,7 +646,6 @@ static int tca6507_probe_gpios(struct i2c_client *client,
        for (i = 0; i < NUM_LEDS; i++)
                if (pdata->leds.leds[i].name && pdata->leds.leds[i].flags) {
                        /* Configure as a gpio */
-                       tca->gpio_name[gpios] = pdata->leds.leds[i].name;
                        tca->gpio_map[gpios] = i;
                        gpios++;
                }
@@ -656,7 +654,6 @@ static int tca6507_probe_gpios(struct i2c_client *client,
                return 0;
 
        tca->gpio.label = "gpio-tca6507";
-       tca->gpio.names = tca->gpio_name;
        tca->gpio.ngpio = gpios;
        tca->gpio.base = pdata->gpio_base;
        tca->gpio.owner = THIS_MODULE;