ASoC: rt5677: Refactor code to avoid comparison unsigned >= 0
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 18 Jul 2017 17:34:18 +0000 (20:34 +0300)
committerMark Brown <broonie@kernel.org>
Wed, 19 Jul 2017 11:23:47 +0000 (12:23 +0100)
rt5677_to_irq() has couple of redundant conditionals, one of which
compares unsigned variable to be great than or equal to zero which
is always true as compiler notices:

sound/soc/codecs/rt5677.c: In function ‘rt5677_to_irq’:
sound/soc/codecs/rt5677.c:4626:13: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits]

Refactor the code by removing redundant conditionals.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/rt5677.c

index 0f9642c2198ae8cfdaf0409cdae41372ed9dc37c..a3cce57739c3d6f99c4db800d1b26d310ed78b24 100644 (file)
@@ -4625,35 +4625,27 @@ static int rt5677_to_irq(struct gpio_chip *chip, unsigned offset)
        struct regmap_irq_chip_data *data = rt5677->irq_data;
        int irq;
 
-       if (offset >= RT5677_GPIO1 && offset <= RT5677_GPIO3) {
-               if ((rt5677->pdata.jd1_gpio == 1 && offset == RT5677_GPIO1) ||
-                       (rt5677->pdata.jd1_gpio == 2 &&
-                               offset == RT5677_GPIO2) ||
-                       (rt5677->pdata.jd1_gpio == 3 &&
-                               offset == RT5677_GPIO3)) {
-                       irq = RT5677_IRQ_JD1;
-               } else {
-                       return -ENXIO;
-               }
-       }
-
-       if (offset >= RT5677_GPIO4 && offset <= RT5677_GPIO6) {
-               if ((rt5677->pdata.jd2_gpio == 1 && offset == RT5677_GPIO4) ||
-                       (rt5677->pdata.jd2_gpio == 2 &&
-                               offset == RT5677_GPIO5) ||
-                       (rt5677->pdata.jd2_gpio == 3 &&
-                               offset == RT5677_GPIO6)) {
-                       irq = RT5677_IRQ_JD2;
-               } else if ((rt5677->pdata.jd3_gpio == 1 &&
-                               offset == RT5677_GPIO4) ||
-                       (rt5677->pdata.jd3_gpio == 2 &&
-                               offset == RT5677_GPIO5) ||
-                       (rt5677->pdata.jd3_gpio == 3 &&
-                               offset == RT5677_GPIO6)) {
-                       irq = RT5677_IRQ_JD3;
-               } else {
-                       return -ENXIO;
-               }
+       if ((rt5677->pdata.jd1_gpio == 1 && offset == RT5677_GPIO1) ||
+               (rt5677->pdata.jd1_gpio == 2 &&
+                       offset == RT5677_GPIO2) ||
+               (rt5677->pdata.jd1_gpio == 3 &&
+                       offset == RT5677_GPIO3)) {
+               irq = RT5677_IRQ_JD1;
+       } else if ((rt5677->pdata.jd2_gpio == 1 && offset == RT5677_GPIO4) ||
+               (rt5677->pdata.jd2_gpio == 2 &&
+                       offset == RT5677_GPIO5) ||
+               (rt5677->pdata.jd2_gpio == 3 &&
+                       offset == RT5677_GPIO6)) {
+               irq = RT5677_IRQ_JD2;
+       } else if ((rt5677->pdata.jd3_gpio == 1 &&
+                       offset == RT5677_GPIO4) ||
+               (rt5677->pdata.jd3_gpio == 2 &&
+                       offset == RT5677_GPIO5) ||
+               (rt5677->pdata.jd3_gpio == 3 &&
+                       offset == RT5677_GPIO6)) {
+               irq = RT5677_IRQ_JD3;
+       } else {
+               return -ENXIO;
        }
 
        return regmap_irq_get_virq(data, irq);