From: Jacopo Mondi Date: Thu, 24 Aug 2017 08:52:18 +0000 (+0200) Subject: pinctrl: rza1: Remove suffix from gpiochip label X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cb715d0ad0ed8cbbf39a7fec303e9b6fa7fe6502;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git pinctrl: rza1: Remove suffix from gpiochip label The OF node name already contains the gpio chip identifier, no need to append it when creating the label. The following debug message clearly shows the suffix is not required "pinctrl-rza1 fcfe3000.pin-controller: Parsed gpiochip gpio-0-0 with 6 pins" Signed-off-by: Jacopo Mondi Signed-off-by: Linus Walleij --- diff --git a/drivers/pinctrl/pinctrl-rza1.c b/drivers/pinctrl/pinctrl-rza1.c index 7fe5b373f58c..04d058706b80 100644 --- a/drivers/pinctrl/pinctrl-rza1.c +++ b/drivers/pinctrl/pinctrl-rza1.c @@ -1096,8 +1096,8 @@ static int rza1_parse_gpiochip(struct rza1_pinctrl *rza1_pctl, *chip = rza1_gpiochip_template; chip->base = -1; - chip->label = devm_kasprintf(rza1_pctl->dev, GFP_KERNEL, "%s-%u", - np->name, gpioport); + chip->label = devm_kasprintf(rza1_pctl->dev, GFP_KERNEL, "%s", + np->name); chip->ngpio = of_args.args[2]; chip->of_node = np; chip->parent = rza1_pctl->dev;