summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorMatthias Kaehlcke <mka@chromium.org>2017-03-31 18:00:04 -0700
committerTakashi Iwai <tiwai@suse.de>2017-04-01 10:46:18 +0200
commitd1600401faad4bc186bfdb291d8af644465e20bd (patch)
tree01e746e697e6c25024e8f937e507f62cb22224f9 /sound/pci
parenta8c006aafead3c45ae5d5601e3717055bccf41bc (diff)
downloadop-kernel-dev-d1600401faad4bc186bfdb291d8af644465e20bd.zip
op-kernel-dev-d1600401faad4bc186bfdb291d8af644465e20bd.tar.gz
ALSA: hda/ca0132: Limit values for chip addresses to 32-bit
With the previous unsigned long value clang generates warnings like this: sound/pci/hda/patch_ca0132.c:860:37: error: implicit conversion from 'unsigned long' to 'u32' (aka 'unsigned int') changes value from 18446744073709551615 to 4294967295 [-Werror,-Wconstant-conversion] spec->curr_chip_addx = (res < 0) ? ~0UL : chip_addx; ~ ^~~~ Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_ca0132.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index fb2e242..a148176 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -857,7 +857,7 @@ static int chipio_write_address(struct hda_codec *codec,
chip_addx >> 16);
}
- spec->curr_chip_addx = (res < 0) ? ~0UL : chip_addx;
+ spec->curr_chip_addx = (res < 0) ? ~0U : chip_addx;
return res;
}
@@ -882,7 +882,7 @@ static int chipio_write_data(struct hda_codec *codec, unsigned int data)
/*If no error encountered, automatically increment the address
as per chip behaviour*/
spec->curr_chip_addx = (res != -EIO) ?
- (spec->curr_chip_addx + 4) : ~0UL;
+ (spec->curr_chip_addx + 4) : ~0U;
return res;
}
@@ -933,7 +933,7 @@ static int chipio_read_data(struct hda_codec *codec, unsigned int *data)
/*If no error encountered, automatically increment the address
as per chip behaviour*/
spec->curr_chip_addx = (res != -EIO) ?
- (spec->curr_chip_addx + 4) : ~0UL;
+ (spec->curr_chip_addx + 4) : ~0U;
return res;
}
OpenPOWER on IntegriCloud