UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: core: Allow snd_soc_update_bits use 32 bits register 

Change reg's type from unsigned short to unsigned int. So that we can use
32 bits reg value in snd_soc_update_bits.

Signed-off-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Bard Liao 2014-04-08 11:18:10 +08:00 committed by Mark Brown
parent b318ad5036
commit 1a39019e93
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/sound/soc.h
View File

@ -469,12 +469,12 @@ static inline void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,
#endif #endif
/* codec register bit access */ /* codec register bit access */
int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg, int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned int reg,
unsigned int mask, unsigned int value); unsigned int mask, unsigned int value);
int snd_soc_update_bits_locked(struct snd_soc_codec *codec, int snd_soc_update_bits_locked(struct snd_soc_codec *codec,
unsigned short reg, unsigned int mask, unsigned int reg, unsigned int mask,
unsigned int value); unsigned int value);
int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned short reg, int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned int reg,
unsigned int mask, unsigned int value); unsigned int mask, unsigned int value);
int snd_soc_new_ac97_codec(struct snd_soc_codec *codec, int snd_soc_new_ac97_codec(struct snd_soc_codec *codec,

8
sound/soc/soc-core.c
View File

@ -2330,7 +2330,7 @@ EXPORT_SYMBOL_GPL(snd_soc_write);
* *
* Returns 1 for change, 0 for no change, or negative error code. * Returns 1 for change, 0 for no change, or negative error code.
*/ */
int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg, int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned int reg,
unsigned int mask, unsigned int value) unsigned int mask, unsigned int value)
{ {
bool change; bool change;
@ -2371,7 +2371,7 @@ EXPORT_SYMBOL_GPL(snd_soc_update_bits);
* Returns 1 for change else 0. * Returns 1 for change else 0.
*/ */
int snd_soc_update_bits_locked(struct snd_soc_codec *codec, int snd_soc_update_bits_locked(struct snd_soc_codec *codec,
unsigned short reg, unsigned int mask, unsigned int reg, unsigned int mask,
unsigned int value) unsigned int value)
{ {
int change; int change;
@ -2396,7 +2396,7 @@ EXPORT_SYMBOL_GPL(snd_soc_update_bits_locked);
* *
* Returns 1 for change else 0. * Returns 1 for change else 0.
*/ */
int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned short reg, int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned int reg,
unsigned int mask, unsigned int value) unsigned int mask, unsigned int value)
{ {
int change; int change;
@ -2911,7 +2911,7 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol,
int min = mc->min; int min = mc->min;
int mask = (1 << (fls(min + max) - 1)) - 1; int mask = (1 << (fls(min + max) - 1)) - 1;
int err = 0; int err = 0;
unsigned short val, val_mask, val2 = 0; unsigned int val, val_mask, val2 = 0;
val_mask = mask << shift; val_mask = mask << shift;
val = (ucontrol->value.integer.value[0] + min) & mask; val = (ucontrol->value.integer.value[0] + min) & mask;