ASoC: ti: omap-mcsp: remove duplicate test
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Fri, 26 Mar 2021 21:59:25 +0000 (16:59 -0500)
committerMark Brown <broonie@kernel.org>
Wed, 31 Mar 2021 17:03:26 +0000 (18:03 +0100)
cppcheck warning:

sound/soc/ti/omap-mcbsp.c:379:11: style: The if condition is the same
as the previous if condition [duplicateCondition]

 if (mcbsp->irq) {
          ^
sound/soc/ti/omap-mcbsp.c:376:11: note: First condition
 if (mcbsp->irq)
          ^
sound/soc/ti/omap-mcbsp.c:379:11: note: Second condition
 if (mcbsp->irq) {
          ^

Keeping two separate tests was probably intentional for clarity, but
since this generates warnings we might as well make cppcheck happy so
that we have fewer warnings.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@gmail.com>
Link: https://lore.kernel.org/r/20210326215927.936377-16-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/ti/omap-mcbsp.c

index 6025b30bbe77ec4c5c787fabfc51dc8e6452850d..db47981768c5d76435ddc570eb51366a930975aa 100644 (file)
@@ -373,10 +373,9 @@ static void omap_mcbsp_free(struct omap_mcbsp *mcbsp)
                MCBSP_WRITE(mcbsp, WAKEUPEN, 0);
 
        /* Disable interrupt requests */
-       if (mcbsp->irq)
+       if (mcbsp->irq) {
                MCBSP_WRITE(mcbsp, IRQEN, 0);
 
-       if (mcbsp->irq) {
                free_irq(mcbsp->irq, (void *)mcbsp);
        } else {
                free_irq(mcbsp->rx_irq, (void *)mcbsp);