Merge tag 'irq_urgent_for_v6.5_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit a9943ad3dddb · 2023-07-09T10:16:04.000-07:00
Pull irq update from Borislav Petkov:

 - Optimize IRQ domain's name assignment

* tag 'irq_urgent_for_v6.5_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqdomain: Use return value of strreplace()
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
@@ -182,9 +182,7 @@ static struct irq_domain *__irq_domain_create(struct fwnode_handle *fwnode,
 			return NULL;
 		}
 
-		strreplace(name, '/', ':');
-
-		domain->name = name;
+		domain->name = strreplace(name, '/', ':');
 		domain->fwnode = fwnode;
 		domain->flags |= IRQ_DOMAIN_NAME_ALLOCATED;
 	}

Original file line number	Diff line number	Diff line change
`@@ -182,9 +182,7 @@ static struct irq_domain __irq_domain_create(struct fwnode_handle fwnode,`
`182`	`182`	`return NULL;`
`183`	`183`	`}`
`184`	`184`
`185`		`- strreplace(name, '/', ':');`
`186`		`-`
`187`		`- domain->name = name;`
	`185`	`+ domain->name = strreplace(name, '/', ':');`
`188`	`186`	`domain->fwnode = fwnode;`
`189`	`187`	`domain->flags \|= IRQ_DOMAIN_NAME_ALLOCATED;`
`190`	`188`	`}`