Commit 6add6b02 authored Jul 02, 2020 by Pierre-Louis Bossart Committed by Takashi Iwai Jul 07, 2020

ALSA: pci/oxygen/xonar_wm87x6: remove always true condition



Fix W=1 warnings:

sound/pci/oxygen/xonar_wm87x6.c: In function ‘wm8776_write’:
sound/pci/oxygen/xonar_wm87x6.c:119:11: warning: comparison of
unsigned expression >= 0 is always true [-Wtype-limits]
  119 |   if (reg >= WM8776_HPLVOL && reg <= WM8776_DACMASTER)
      |           ^~
sound/pci/oxygen/xonar_wm87x6.c: In function ‘wm8766_write’:
sound/pci/oxygen/xonar_wm87x6.c:147:12: warning: comparison of
unsigned expression >= 0 is always true [-Wtype-limits]
  147 |   if ((reg >= WM8766_LDA1 && reg <= WM8766_RDA1) ||
      |            ^~

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20200702193604.169059-17-pierre-louis.bossart@linux.intel.com


Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent ab3ee092

sound/pci/oxygen/xonar_wm87x6.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -116,7 +116,8 @@ static void wm8776_write(struct oxygen *chip,
		else
		wm8776_write_i2c(chip, reg, value);
		if (reg < ARRAY_SIZE(data->wm8776_regs)) {
		if (reg >= WM8776_HPLVOL && reg <= WM8776_DACMASTER)
		/* reg >= WM8776_HPLVOL is always true */
		if (reg <= WM8776_DACMASTER)
		value &= ~WM8776_UPDATE;
		data->wm8776_regs[reg] = value;
		}
		@@ -144,7 +145,8 @@ static void wm8766_write(struct oxygen *chip,
		OXYGEN_SPI_CEN_LATCH_CLOCK_LO,
		(reg << 9) \| value);
		if (reg < ARRAY_SIZE(data->wm8766_regs)) {
		if ((reg >= WM8766_LDA1 && reg <= WM8766_RDA1) \|\|
		/* reg >= WM8766_LDA1 is always true */
		if (reg <= WM8766_RDA1 \|\|
		(reg >= WM8766_LDA2 && reg <= WM8766_MASTDA))
		value &= ~WM8766_UPDATE;
		data->wm8766_regs[reg] = value;