Commit ff19ad29 authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman

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: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Reviewed-by: default avatarNeilBrown <neil@brown.name>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 24186ccd
...@@ -196,15 +196,6 @@ static struct irq_chip mediatek_gpio_irq_chip = { ...@@ -196,15 +196,6 @@ static struct irq_chip mediatek_gpio_irq_chip = {
.irq_set_type = mediatek_gpio_irq_type, .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 static int
mediatek_gpio_xlate(struct gpio_chip *chip, mediatek_gpio_xlate(struct gpio_chip *chip,
const struct of_phandle_args *spec, u32 *flags) const struct of_phandle_args *spec, u32 *flags)
...@@ -251,7 +242,8 @@ mediatek_gpio_bank_probe(struct platform_device *pdev, ...@@ -251,7 +242,8 @@ mediatek_gpio_bank_probe(struct platform_device *pdev,
rg->chip.of_gpio_n_cells = 2; rg->chip.of_gpio_n_cells = 2;
rg->chip.of_xlate = mediatek_gpio_xlate; 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); ret = devm_gpiochip_add_data(&pdev->dev, &rg->chip, gpio);
if (ret < 0) { if (ret < 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment