[PATCH 09/20] gpio/rockchip: drop 'bank->name' from the driver
Jianqun Xu
jay.xu at rock-chips.com
Tue Sep 20 03:30:57 PDT 2022
Not to use the 'bank->name' and create 'gc->lable' by the bank number.
Signed-off-by: Jianqun Xu <jay.xu at rock-chips.com>
---
drivers/gpio/gpio-rockchip.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c
index bb50335239ac..dafcc8be1687 100644
--- a/drivers/gpio/gpio-rockchip.c
+++ b/drivers/gpio/gpio-rockchip.c
@@ -327,7 +327,7 @@ static void rockchip_irq_demux(struct irq_desc *desc)
struct rockchip_pin_bank *bank = irq_desc_get_handler_data(desc);
u32 pend;
- dev_dbg(bank->dev, "got irq for bank %s\n", bank->name);
+ dev_dbg(bank->dev, "got irq\n");
chained_irq_enter(chip, desc);
@@ -521,8 +521,7 @@ static int rockchip_interrupts_register(struct rockchip_pin_bank *bank)
bank->domain = irq_domain_add_linear(bank->of_node, 32,
&irq_generic_chip_ops, NULL);
if (!bank->domain) {
- dev_warn(bank->dev, "could not init irq domain for bank %s\n",
- bank->name);
+ dev_warn(bank->dev, "could not init irq domain\n");
return -EINVAL;
}
@@ -531,8 +530,7 @@ static int rockchip_interrupts_register(struct rockchip_pin_bank *bank)
handle_level_irq,
clr, 0, 0);
if (ret) {
- dev_err(bank->dev, "could not alloc generic chips for bank %s\n",
- bank->name);
+ dev_err(bank->dev, "could not alloc generic chips\n");
irq_domain_remove(bank->domain);
return -EINVAL;
}
@@ -586,8 +584,10 @@ static int rockchip_gpiolib_register(struct rockchip_pin_bank *bank)
gc = &bank->gpio_chip;
gc->base = bank->pin_base;
gc->ngpio = bank->nr_pins;
- gc->label = bank->name;
gc->parent = bank->dev;
+ gc->label = devm_kasprintf(bank->dev, GFP_KERNEL, "gpio%d", bank->bank_num);
+ if (!gc->label)
+ return -ENOMEM;
ret = gpiochip_add_data(gc, bank);
if (ret) {
--
2.25.1
More information about the Linux-rockchip
mailing list