The following commit has been merged into the irq/core branch of tip:
Commit-ID: 7b9414cb2d370b7c5149b37f585b077af2ae211b
Gitweb: https://git.kernel.org/tip/7b9414cb2d370b7c5149b37f585b077af2ae211b
Author: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
AuthorDate: Mon, 12 Aug 2024 22:29:40 +03:00
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Tue, 13 Aug 2024 10:40:10 +02:00
irqdomain: Remove stray '-' in the domain name
When the domain suffix is not supplied alloc_fwnode_name() unconditionally
adds a separator.
Fix the format strings to get rid of the stray '-' separator.
Fixes: 1e7c05292531 ("irqdomain: Allow giving name suffix for domain")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/all/20240812193101.1266625-3-andriy.shevchenko@xxxxxxxxxxxxxxx
---
kernel/irq/irqdomain.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index 18d253e..1acc530 100644
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -149,9 +149,9 @@ static int alloc_fwnode_name(struct irq_domain *domain, const struct fwnode_hand
char *name;
if (bus_token == DOMAIN_BUS_ANY)
- name = kasprintf(GFP_KERNEL, "%pfw-%s", fwnode, suf);
+ name = kasprintf(GFP_KERNEL, "%pfw%s%s", fwnode, sep, suf);
else
- name = kasprintf(GFP_KERNEL, "%pfw-%s%s%d", fwnode, suf, sep, bus_token);
+ name = kasprintf(GFP_KERNEL, "%pfw%s%s-%d", fwnode, sep, suf, bus_token);
if (!name)
return -ENOMEM;
|