[PATCH v1 1/1] regmap: irq: Get rid of duplicate check in regmap_del_irq_chip()

[PATCH v1 1/1] regmap: irq: Get rid of duplicate check in regmap_del_irq_chip()

[Andy Shevchenko]

irq_dispose_mapping() already 0-aware, so there is no need to
perform the same test outside of the call. Get rid of duplicate
check in regmap_del_irq_chip().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/base/regmap/regmap-irq.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index 715eb9e7aa2a..bd7c89618dd7 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -1021,7 +1021,6 @@ EXPORT_SYMBOL_GPL(regmap_add_irq_chip);
  */
 void regmap_del_irq_chip(int irq, struct regmap_irq_chip_data *d)
 {
-	unsigned int virq;
 	int i, hwirq;
 
 	if (!d)
@@ -1039,9 +1038,7 @@ void regmap_del_irq_chip(int irq, struct regmap_irq_chip_data *d)
 		 * Find the virtual irq of hwirq on chip and if it is
 		 * there then dispose it
 		 */
-		virq = irq_find_mapping(d->domain, hwirq);
-		if (virq)
-			irq_dispose_mapping(virq);
+		irq_dispose_mapping(irq_find_mapping(d->domain, hwirq));
 	}
 
 	irq_domain_remove(d->domain);
-- 
2.50.1

Re: [PATCH v1 1/1] regmap: irq: Get rid of duplicate check in regmap_del_irq_chip()

[Johan Hovold]

On Wed, Oct 21, 2026 at 10:50:35PM +0200, Andy Shevchenko wrote:
> irq_dispose_mapping() already 0-aware, so there is no need to
> perform the same test outside of the call. Get rid of duplicate
> check in regmap_del_irq_chip().
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> @@ -1039,9 +1038,7 @@ void regmap_del_irq_chip(int irq, struct regmap_irq_chip_data *d)
>  		 * Find the virtual irq of hwirq on chip and if it is
>  		 * there then dispose it
>  		 */
> -		virq = irq_find_mapping(d->domain, hwirq);
> -		if (virq)
> -			irq_dispose_mapping(virq);
> +		irq_dispose_mapping(irq_find_mapping(d->domain, hwirq));

This just makes the code less readable, and for no good reason.

Johan

Re: [PATCH v1 1/1] regmap: irq: Get rid of duplicate check in regmap_del_irq_chip()

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 708 bytes --]

On Thu, Oct 22, 2026 at 10:13:57AM +0200, Johan Hovold wrote:
> On Wed, Oct 21, 2026 at 10:50:35PM +0200, Andy Shevchenko wrote:
> > irq_dispose_mapping() already 0-aware, so there is no need to
> > perform the same test outside of the call. Get rid of duplicate
> > check in regmap_del_irq_chip().

> > -		virq = irq_find_mapping(d->domain, hwirq);
> > -		if (virq)
> > -			irq_dispose_mapping(virq);
> > +		irq_dispose_mapping(irq_find_mapping(d->domain, hwirq));

> This just makes the code less readable, and for no good reason.

Is there intended to be a benefit from the error check?  It seems like a
microopotimisation that just removes robustness from something that
really should not be a hot path.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH v1 1/1] regmap: irq: Get rid of duplicate check in regmap_del_irq_chip()

[Johan Hovold]

[-- Attachment #1: Type: text/plain, Size: 1044 bytes --]

On Thu, Oct 22, 2026 at 02:26:51PM +0100, Mark Brown wrote:
> On Thu, Oct 22, 2026 at 10:13:57AM +0200, Johan Hovold wrote:
> > On Wed, Oct 21, 2026 at 10:50:35PM +0200, Andy Shevchenko wrote:
> > > irq_dispose_mapping() already 0-aware, so there is no need to
> > > perform the same test outside of the call. Get rid of duplicate
> > > check in regmap_del_irq_chip().
> 
> > > -		virq = irq_find_mapping(d->domain, hwirq);
> > > -		if (virq)
> > > -			irq_dispose_mapping(virq);
> > > +		irq_dispose_mapping(irq_find_mapping(d->domain, hwirq));
> 
> > This just makes the code less readable, and for no good reason.
> 
> Is there intended to be a benefit from the error check?  It seems like a
> microopotimisation that just removes robustness from something that
> really should not be a hot path.

The code as it stands is easier to read and obviously correct (and
matches the preceding comment); you don't need look up the definition of
irq_dispose_mapping() and parse a ternary conditional to determine that.

Johan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 265 bytes --]