diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2014-08-17 10:18:22 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-08-17 10:35:58 -0400 |
commit | 6391fffb7b6099fae0e869229279d147c47f617a (patch) | |
tree | 78d7c5794b39f583572f5e6e4ba399d573079fa4 | |
parent | 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 (diff) |
ASoC: ab8500-codec: Drop bank prefix from AB8500_GPIO_DIR4_REG register define
The AB8500_GPIO_DIR4_REG register define has the bank for the register in the
upper 8 bits and the register itself in the lower 8 bits. When passing it to
abx500_{set,get}_register_interruptible() the upper bits get truncated which
generates the following warning from sparse:
sound/soc/codecs/ab8500-codec.c:1972:53: warning: cast truncates bits
from constant value (1013 becomes 13)
sound/soc/codecs/ab8500-codec.c:1980:53: warning: cast truncates bits
from constant value (1013 becomes 13)
The bank is passed separately to abx500_{set,get}_register_interruptible() so
the code works fine as it is. Given that all users of AB8500_GPIO_DIR4_REG
always truncate the upper 8 bits just remove them from the define.
Also remove the unnecessary casts to u8.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | sound/soc/codecs/ab8500-codec.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index 1fb4402bf72d..62cf231f34cb 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c | |||
@@ -56,8 +56,7 @@ | |||
56 | #define GPIO31_DIR_OUTPUT 0x40 | 56 | #define GPIO31_DIR_OUTPUT 0x40 |
57 | 57 | ||
58 | /* Macrocell register definitions */ | 58 | /* Macrocell register definitions */ |
59 | #define AB8500_CTRL3_REG 0x0200 | 59 | #define AB8500_GPIO_DIR4_REG 0x13 /* Bank AB8500_MISC */ |
60 | #define AB8500_GPIO_DIR4_REG 0x1013 | ||
61 | 60 | ||
62 | /* Nr of FIR/IIR-coeff banks in ANC-block */ | 61 | /* Nr of FIR/IIR-coeff banks in ANC-block */ |
63 | #define AB8500_NR_OF_ANC_COEFF_BANKS 2 | 62 | #define AB8500_NR_OF_ANC_COEFF_BANKS 2 |
@@ -1968,16 +1967,16 @@ static int ab8500_audio_setup_mics(struct snd_soc_codec *codec, | |||
1968 | dev_dbg(codec->dev, "%s: Enter.\n", __func__); | 1967 | dev_dbg(codec->dev, "%s: Enter.\n", __func__); |
1969 | 1968 | ||
1970 | /* Set DMic-clocks to outputs */ | 1969 | /* Set DMic-clocks to outputs */ |
1971 | status = abx500_get_register_interruptible(codec->dev, (u8)AB8500_MISC, | 1970 | status = abx500_get_register_interruptible(codec->dev, AB8500_MISC, |
1972 | (u8)AB8500_GPIO_DIR4_REG, | 1971 | AB8500_GPIO_DIR4_REG, |
1973 | &value8); | 1972 | &value8); |
1974 | if (status < 0) | 1973 | if (status < 0) |
1975 | return status; | 1974 | return status; |
1976 | value = value8 | GPIO27_DIR_OUTPUT | GPIO29_DIR_OUTPUT | | 1975 | value = value8 | GPIO27_DIR_OUTPUT | GPIO29_DIR_OUTPUT | |
1977 | GPIO31_DIR_OUTPUT; | 1976 | GPIO31_DIR_OUTPUT; |
1978 | status = abx500_set_register_interruptible(codec->dev, | 1977 | status = abx500_set_register_interruptible(codec->dev, |
1979 | (u8)AB8500_MISC, | 1978 | AB8500_MISC, |
1980 | (u8)AB8500_GPIO_DIR4_REG, | 1979 | AB8500_GPIO_DIR4_REG, |
1981 | value); | 1980 | value); |
1982 | if (status < 0) | 1981 | if (status < 0) |
1983 | return status; | 1982 | return status; |