ALSA: ASoC: convert use of uint to unsigned int

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

ASOC: convert use of uint to unsigned int

Signed-off-by: Jon Smirl <jonsmirl@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

authored by

Jon Smirl and committed by

Jaroslav Kysela 17 years ago 815ecf8d 0c941615

+43 -43

3 changed files

expand all

include

sound

soc.h

sound

soc

soc-core.c

soc-dapm.c

+1 -1

include/sound/soc.h

··· 527 527 /* mixer control */ 528 528 struct soc_mixer_control { 529 529 int min, max; 530 - uint reg, rreg, shift, rshift, invert; 530 + unsigned int reg, rreg, shift, rshift, invert; 531 531 }; 532 532 533 533 /* enumerated kcontrol */

+24 -24

sound/soc/soc-core.c

··· 1457 1457 struct soc_mixer_control *mc = 1458 1458 (struct soc_mixer_control *)kcontrol->private_value; 1459 1459 int max = mc->max; 1460 - uint shift = mc->min; 1461 - uint rshift = mc->rshift; 1460 + unsigned int shift = mc->min; 1461 + unsigned int rshift = mc->rshift; 1462 1462 1463 1463 if (max == 1) 1464 1464 uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; ··· 1487 1487 struct soc_mixer_control *mc = 1488 1488 (struct soc_mixer_control *)kcontrol->private_value; 1489 1489 struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); 1490 - uint reg = mc->reg; 1491 - uint shift = mc->shift; 1492 - uint rshift = mc->rshift; 1490 + unsigned int reg = mc->reg; 1491 + unsigned int shift = mc->shift; 1492 + unsigned int rshift = mc->rshift; 1493 1493 int max = mc->max; 1494 - uint mask = (1 << fls(max)) - 1; 1495 - uint invert = mc->invert; 1494 + unsigned int mask = (1 << fls(max)) - 1; 1495 + unsigned int invert = mc->invert; 1496 1496 1497 1497 ucontrol->value.integer.value[0] = 1498 1498 (snd_soc_read(codec, reg) >> shift) & mask; ··· 1526 1526 struct soc_mixer_control *mc = 1527 1527 (struct soc_mixer_control *)kcontrol->private_value; 1528 1528 struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); 1529 - uint reg = mc->reg; 1530 - uint shift = mc->shift; 1531 - uint rshift = mc->rshift; 1529 + unsigned int reg = mc->reg; 1530 + unsigned int shift = mc->shift; 1531 + unsigned int rshift = mc->rshift; 1532 1532 int max = mc->max; 1533 - uint mask = (1 << fls(max)) - 1; 1534 - uint invert = mc->invert; 1533 + unsigned int mask = (1 << fls(max)) - 1; 1534 + unsigned int invert = mc->invert; 1535 1535 unsigned short val, val2, val_mask; 1536 1536 1537 1537 val = (ucontrol->value.integer.value[0] & mask); ··· 1594 1594 struct soc_mixer_control *mc = 1595 1595 (struct soc_mixer_control *)kcontrol->private_value; 1596 1596 struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); 1597 - uint reg = mc->reg; 1598 - uint reg2 = mc->rreg; 1599 - uint shift = mc->shift; 1597 + unsigned int reg = mc->reg; 1598 + unsigned int reg2 = mc->rreg; 1599 + unsigned int shift = mc->shift; 1600 1600 int max = mc->max; 1601 - uint mask = (1<<fls(max))-1; 1602 - uint invert = mc->invert; 1601 + unsigned int mask = (1<<fls(max))-1; 1602 + unsigned int invert = mc->invert; 1603 1603 1604 1604 ucontrol->value.integer.value[0] = 1605 1605 (snd_soc_read(codec, reg) >> shift) & mask; ··· 1631 1631 struct soc_mixer_control *mc = 1632 1632 (struct soc_mixer_control *)kcontrol->private_value; 1633 1633 struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); 1634 - uint reg = mc->reg; 1635 - uint reg2 = mc->rreg; 1636 - uint shift = mc->shift; 1634 + unsigned int reg = mc->reg; 1635 + unsigned int reg2 = mc->rreg; 1636 + unsigned int shift = mc->shift; 1637 1637 int max = mc->max; 1638 - uint mask = (1 << fls(max)) - 1; 1639 - uint invert = mc->invert; 1638 + unsigned int mask = (1 << fls(max)) - 1; 1639 + unsigned int invert = mc->invert; 1640 1640 int err; 1641 1641 unsigned short val, val2, val_mask; 1642 1642 ··· 1701 1701 struct soc_mixer_control *mc = 1702 1702 (struct soc_mixer_control *)kcontrol->private_value; 1703 1703 struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); 1704 - uint reg = mc->reg; 1704 + unsigned int reg = mc->reg; 1705 1705 int min = mc->min; 1706 1706 int val = snd_soc_read(codec, reg); 1707 1707 ··· 1728 1728 struct soc_mixer_control *mc = 1729 1729 (struct soc_mixer_control *)kcontrol->private_value; 1730 1730 struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); 1731 - uint reg = mc->reg; 1731 + unsigned int reg = mc->reg; 1732 1732 int min = mc->min; 1733 1733 unsigned short val; 1734 1734

+18 -18

sound/soc/soc-dapm.c

··· 106 106 int val; 107 107 struct soc_mixer_control *mc = (struct soc_mixer_control *) 108 108 w->kcontrols[i].private_value; 109 - uint reg = mc->reg; 110 - uint shift = mc->shift; 109 + unsigned int reg = mc->reg; 110 + unsigned int shift = mc->shift; 111 111 int max = mc->max; 112 - uint mask = (1 << fls(max)) - 1; 113 - uint invert = mc->invert; 112 + unsigned int mask = (1 << fls(max)) - 1; 113 + unsigned int invert = mc->invert; 114 114 115 115 val = snd_soc_read(w->codec, reg); 116 116 val = (val >> shift) & mask; ··· 252 252 if (widget->num_kcontrols && k) { 253 253 struct soc_mixer_control *mc = 254 254 (struct soc_mixer_control *)k->private_value; 255 - uint reg = mc->reg; 256 - uint shift = mc->shift; 255 + unsigned int reg = mc->reg; 256 + unsigned int shift = mc->shift; 257 257 int max = mc->max; 258 - uint mask = (1 << fls(max)) - 1; 259 - uint invert = mc->invert; 258 + unsigned int mask = (1 << fls(max)) - 1; 259 + unsigned int invert = mc->invert; 260 260 261 261 if (power) { 262 262 int i; ··· 1141 1141 struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol); 1142 1142 struct soc_mixer_control *mc = 1143 1143 (struct soc_mixer_control *)kcontrol->private_value; 1144 - uint reg = mc->reg; 1145 - uint shift = mc->shift; 1146 - uint rshift = mc->rshift; 1144 + unsigned int reg = mc->reg; 1145 + unsigned int shift = mc->shift; 1146 + unsigned int rshift = mc->rshift; 1147 1147 int max = mc->max; 1148 - uint invert = mc->invert; 1149 - uint mask = (1 << fls(max)) - 1; 1148 + unsigned int invert = mc->invert; 1149 + unsigned int mask = (1 << fls(max)) - 1; 1150 1150 1151 1151 /* return the saved value if we are powered down */ 1152 1152 if (widget->id == snd_soc_dapm_pga && !widget->power) { ··· 1186 1186 struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol); 1187 1187 struct soc_mixer_control *mc = 1188 1188 (struct soc_mixer_control *)kcontrol->private_value; 1189 - uint reg = mc->reg; 1190 - uint shift = mc->shift; 1191 - uint rshift = mc->rshift; 1189 + unsigned int reg = mc->reg; 1190 + unsigned int shift = mc->shift; 1191 + unsigned int rshift = mc->rshift; 1192 1192 int max = mc->max; 1193 - uint mask = (1 << fls(max)) - 1; 1194 - uint invert = mc->invert; 1193 + unsigned int mask = (1 << fls(max)) - 1; 1194 + unsigned int invert = mc->invert; 1195 1195 unsigned short val, val2, val_mask; 1196 1196 int ret; 1197 1197