diff options
| author | Sergio Paracuellos <sergio.paracuellos@gmail.com> | 2018-07-05 08:00:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-06 17:32:24 +0200 |
| commit | ff19ad29d257f7b3ff738054f9040606998cc114 (patch) | |
| tree | 53e770c27faa22895682c792fa7738484b57a83b | |
| parent | 24186ccda251c8880de0e77ce3bb28a4066763b2 (diff) | |
| download | staging-ff19ad29d257f7b3ff738054f9040606998cc114.tar.gz | |
staging: mt7621-gpio: use devm_kasprintf to set gpio banks labels
Instead of using a custom function to return desired name for gpio
use the default assigned one and concat it '-bankN' suffix using
devm_kasprintf kernel function.
Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Reviewed-by: NeilBrown <neil@brown.name>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/mt7621-gpio/gpio-mt7621.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/staging/mt7621-gpio/gpio-mt7621.c b/drivers/staging/mt7621-gpio/gpio-mt7621.c index 1b4588ab1ec1e..d7256b56e6218 100644 --- a/drivers/staging/mt7621-gpio/gpio-mt7621.c +++ b/drivers/staging/mt7621-gpio/gpio-mt7621.c @@ -196,15 +196,6 @@ static struct irq_chip mediatek_gpio_irq_chip = { .irq_set_type = mediatek_gpio_irq_type, }; -static inline const char * const mediatek_gpio_bank_name(int bank) -{ - static const char * const bank_names[] = { - "mt7621-bank0", "mt7621-bank1", "mt7621-bank2", - }; - - return bank_names[bank]; -} - static int mediatek_gpio_xlate(struct gpio_chip *chip, const struct of_phandle_args *spec, u32 *flags) @@ -251,7 +242,8 @@ mediatek_gpio_bank_probe(struct platform_device *pdev, rg->chip.of_gpio_n_cells = 2; rg->chip.of_xlate = mediatek_gpio_xlate; - rg->chip.label = mediatek_gpio_bank_name(rg->bank); + rg->chip.label = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%s-bank%d", + dev_name(&pdev->dev), bank); ret = devm_gpiochip_add_data(&pdev->dev, &rg->chip, gpio); if (ret < 0) { |