gpio: tegra186: Simplify GPIO line name prefix handling

Introduce TEGRA_GPIO_PREFIX() to define the Tegra SoC GPIO name
prefix in one place. Use it for the Tegra410 COMPUTE and SYSTEM
controllers so the prefix is "COMPUTE-" and "SYSTEM-" respectively.

Signed-off-by: Prathamesh Shete <pshete@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
Link: https://patch.msgid.link/20260217081431.1208351-1-pshete@nvidia.com
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>

diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
index 9c874f07be755e51547fcc080c7272b08807dd3a..f04cc240b5ec5ce8c8379e74bcf18017bd0c2316 100644 (file)
--- a/drivers/gpio/gpio-tegra186.c
+++ b/drivers/gpio/gpio-tegra186.c
@@ -942,12 +942,8 @@ static int tegra186_gpio_probe(struct platform_device *pdev)
                char *name;
 
                for (j = 0; j < port->pins; j++) {
-                       if (gpio->soc->prefix)
-                               name = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "%s-P%s.%02x",
-                                                     gpio->soc->prefix, port->name, j);
-                       else
-                               name = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "P%s.%02x",
-                                                     port->name, j);
+                       name = devm_kasprintf(gpio->gpio.parent, GFP_KERNEL, "%sP%s.%02x",
+                                             gpio->soc->prefix ?: "", port->name, j);
                        if (!name)
                                return -ENOMEM;
 
@@ -1373,6 +1369,9 @@ static const struct tegra_gpio_soc tegra256_main_soc = {
        .has_vm_support = true,
 };
 
+/* Macro to define GPIO name prefix with separator */
+#define TEGRA_GPIO_PREFIX(_x)  _x "-"
+
 #define TEGRA410_COMPUTE_GPIO_PORT(_name, _bank, _port, _pins) \
        TEGRA_GPIO_PORT(TEGRA410_COMPUTE, _name, _bank, _port, _pins)
 
@@ -1388,7 +1387,7 @@ static const struct tegra_gpio_soc tegra410_compute_soc = {
        .num_ports = ARRAY_SIZE(tegra410_compute_ports),
        .ports = tegra410_compute_ports,
        .name = "tegra410-gpio-compute",
-       .prefix = "COMPUTE",
+       .prefix = TEGRA_GPIO_PREFIX("COMPUTE"),
        .num_irqs_per_bank = 8,
        .instance = 0,
 };
@@ -1418,7 +1417,7 @@ static const struct tegra_gpio_soc tegra410_system_soc = {
        .num_ports = ARRAY_SIZE(tegra410_system_ports),
        .ports = tegra410_system_ports,
        .name = "tegra410-gpio-system",
-       .prefix = "SYSTEM",
+       .prefix = TEGRA_GPIO_PREFIX("SYSTEM"),
        .num_irqs_per_bank = 8,
        .instance = 0,
 };