Commit d4e753d3 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown
Browse files

ASoC: rt5677: Refactor code to avoid comparison unsigned >= 0 



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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ddc9e69b

sound/soc/codecs/rt5677.c

+21 −29
Original line number Diff line number Diff line
@@ -4625,20 +4625,13 @@ 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) ||

	} else if ((rt5677->pdata.jd2_gpio == 1 && offset == RT5677_GPIO4) ||

		(rt5677->pdata.jd2_gpio == 2 &&

			offset == RT5677_GPIO5) ||

		(rt5677->pdata.jd2_gpio == 3 &&
@@ -4654,7 +4647,6 @@ static int rt5677_to_irq(struct gpio_chip *chip, unsigned offset) 
	} else {

		return -ENXIO;

	}

	}



	return regmap_irq_get_virq(data, irq);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE