tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

irqdomain: Clarify checks for bus_token

The code uses if (bus_token) and if (bus_token == DOMAIN_BUS_ANY).

Since bus_token is an enum, the latter is more robust against changes.

Convert all !bus_token checks to explicitely check for DOMAIN_BUS_ANY.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20240812193101.1266625-2-andriy.shevchenko@linux.intel.com

authored by

Andy Shevchenko and committed by
Thomas Gleixner c0ece644 46c3e31c

+14 -8
+14 -8
kernel/irq/irqdomain.c
··· 130 130 131 131 static int alloc_name(struct irq_domain *domain, char *base, enum irq_domain_bus_token bus_token) 132 132 { 133 - domain->name = bus_token ? kasprintf(GFP_KERNEL, "%s-%d", base, bus_token) : 134 - kasprintf(GFP_KERNEL, "%s", base); 133 + if (bus_token == DOMAIN_BUS_ANY) 134 + domain->name = kasprintf(GFP_KERNEL, "%s", base); 135 + else 136 + domain->name = kasprintf(GFP_KERNEL, "%s-%d", base, bus_token); 135 137 if (!domain->name) 136 138 return -ENOMEM; 137 139 ··· 148 146 const char *suf = suffix ? : ""; 149 147 char *name; 150 148 151 - name = bus_token ? kasprintf(GFP_KERNEL, "%pfw-%s%s%d", fwnode, suf, sep, bus_token) : 152 - kasprintf(GFP_KERNEL, "%pfw-%s", fwnode, suf); 149 + if (bus_token == DOMAIN_BUS_ANY) 150 + name = kasprintf(GFP_KERNEL, "%pfw-%s", fwnode, suf); 151 + else 152 + name = kasprintf(GFP_KERNEL, "%pfw-%s%s%d", fwnode, suf, sep, bus_token); 153 153 if (!name) 154 154 return -ENOMEM; 155 155 ··· 170 166 static atomic_t unknown_domains; 171 167 int id = atomic_inc_return(&unknown_domains); 172 168 173 - domain->name = bus_token ? kasprintf(GFP_KERNEL, "unknown-%d-%d", id, bus_token) : 174 - kasprintf(GFP_KERNEL, "unknown-%d", id); 175 - 169 + if (bus_token == DOMAIN_BUS_ANY) 170 + domain->name = kasprintf(GFP_KERNEL, "unknown-%d", id); 171 + else 172 + domain->name = kasprintf(GFP_KERNEL, "unknown-%d-%d", id, bus_token); 176 173 if (!domain->name) 177 174 return -ENOMEM; 175 + 178 176 domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED; 179 177 return 0; 180 178 } ··· 206 200 return alloc_name(domain, fwid->name, bus_token); 207 201 default: 208 202 domain->name = fwid->name; 209 - if (bus_token) 203 + if (bus_token != DOMAIN_BUS_ANY) 210 204 return alloc_name(domain, fwid->name, bus_token); 211 205 } 212 206