Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84ed1a19 authored Oct 23, 2009 by Roel Kluin Committed by Takashi Iwai Oct 30, 2009

ALSA: Cleanup redundant tests on unsigned



The variables are unsigned so the test `>= 0' is always true,
the `< 0' test always fails. In these cases the other part of
the test catches wrapped values.

In dac_audio_write() there does not occur a test for wrapped
values, but the test appears redundant.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent a688e488

sound/oss/sh_dac_audio.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -164,9 +164,6 @@ static ssize_t dac_audio_write(struct file file, const char buf, size_t count,
		int free;
		int nbytes;

		if (count < 0)
		return -EINVAL;

		if (!count) {
		dac_audio_sync();
		return 0;

sound/pci/ca0106/ca0106_proc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -304,7 +304,7 @@ static void snd_ca0106_proc_reg_write32(struct snd_info_entry *entry,
		while (!snd_info_get_line(buffer, line, sizeof(line))) {
		if (sscanf(line, "%x %x", &reg, &val) != 2)
		continue;
		if ((reg < 0x40) && (reg >=0) && (val <= 0xffffffff) ) {
		if (reg < 0x40 && val <= 0xffffffff) {
		spin_lock_irqsave(&emu->emu_lock, flags);
		outl(val, emu->port + (reg & 0xfffffffc));
		spin_unlock_irqrestore(&emu->emu_lock, flags);
		@@ -405,7 +405,7 @@ static void snd_ca0106_proc_reg_write(struct snd_info_entry *entry,
		while (!snd_info_get_line(buffer, line, sizeof(line))) {
		if (sscanf(line, "%x %x %x", &reg, &channel_id, &val) != 3)
		continue;
		if ((reg < 0x80) && (reg >=0) && (val <= 0xffffffff) && (channel_id >=0) && (channel_id <= 3) )
		if (reg < 0x80 && val <= 0xffffffff && channel_id <= 3)
		snd_ca0106_ptr_write(emu, reg, channel_id, val);
		}
		}

sound/pci/ctxfi/ctatc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -240,7 +240,7 @@ static int select_rom(unsigned int pitch)
		} else if (pitch == 0x02000000) {
		/* pitch == 2 */
		return 3;
		} else if (pitch >= 0x0 && pitch <= 0x08000000) {
		} else if (pitch <= 0x08000000) {
		/* 0 <= pitch <= 8 */
		return 0;
		} else {

sound/pci/emu10k1/emu10k1x.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1040,8 +1040,7 @@ static void snd_emu10k1x_proc_reg_write(struct snd_info_entry *entry,
		if (sscanf(line, "%x %x %x", &reg, &channel_id, &val) != 3)
		continue;

		if ((reg < 0x49) && (reg >= 0) && (val <= 0xffffffff)
		&& (channel_id >= 0) && (channel_id <= 2) )
		if (reg < 0x49 && val <= 0xffffffff && channel_id <= 2)
		snd_emu10k1x_ptr_write(emu, reg, channel_id, val);
		}
		}

sound/pci/emu10k1/emuproc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -451,7 +451,7 @@ static void snd_emu_proc_io_reg_write(struct snd_info_entry *entry,
		while (!snd_info_get_line(buffer, line, sizeof(line))) {
		if (sscanf(line, "%x %x", &reg, &val) != 2)
		continue;
		if ((reg < 0x40) && (reg >= 0) && (val <= 0xffffffff) ) {
		if (reg < 0x40 && val <= 0xffffffff) {
		spin_lock_irqsave(&emu->emu_lock, flags);
		outl(val, emu->port + (reg & 0xfffffffc));
		spin_unlock_irqrestore(&emu->emu_lock, flags);
		@@ -527,7 +527,7 @@ static void snd_emu_proc_ptr_reg_write(struct snd_info_entry *entry,
		while (!snd_info_get_line(buffer, line, sizeof(line))) {
		if (sscanf(line, "%x %x %x", &reg, &channel_id, &val) != 3)
		continue;
		if ((reg < 0xa0) && (reg >= 0) && (val <= 0xffffffff) && (channel_id >= 0) && (channel_id <= 3) )
		if (reg < 0xa0 && val <= 0xffffffff && channel_id <= 3)
		snd_ptr_write(emu, iobase, reg, channel_id, val);
		}
		}