2 files changed, 42 insertions, 42 deletions

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 11a881caba76..1563ceedf61a 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1457,8 +1457,8 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol,
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         int max = mc->max;
-        uint shift = mc->min;
-        uint rshift = mc->rshift;
+        unsigned int shift = mc->min;
+        unsigned int rshift = mc->rshift;
 
         if (max == 1)
                 uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
@@ -1487,12 +1487,12 @@ int snd_soc_get_volsw(struct snd_kcontrol *kcontrol,
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-        uint reg = mc->reg;
-        uint shift = mc->shift;
-        uint rshift = mc->rshift;
+        unsigned int reg = mc->reg;
+        unsigned int shift = mc->shift;
+        unsigned int rshift = mc->rshift;
         int max = mc->max;
-        uint mask = (1 << fls(max)) - 1;
-        uint invert = mc->invert;
+        unsigned int mask = (1 << fls(max)) - 1;
+        unsigned int invert = mc->invert;
 
         ucontrol->value.integer.value[0] =
                 (snd_soc_read(codec, reg) >> shift) & mask;
@@ -1526,12 +1526,12 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-        uint reg = mc->reg;
-        uint shift = mc->shift;
-        uint rshift = mc->rshift;
+        unsigned int reg = mc->reg;
+        unsigned int shift = mc->shift;
+        unsigned int rshift = mc->rshift;
         int max = mc->max;
-        uint mask = (1 << fls(max)) - 1;
-        uint invert = mc->invert;
+        unsigned int mask = (1 << fls(max)) - 1;
+        unsigned int invert = mc->invert;
         unsigned short val, val2, val_mask;
 
         val = (ucontrol->value.integer.value[0] & mask);
@@ -1594,12 +1594,12 @@ int snd_soc_get_volsw_2r(struct snd_kcontrol *kcontrol,
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-        uint reg = mc->reg;
-        uint reg2 = mc->rreg;
-        uint shift = mc->shift;
+        unsigned int reg = mc->reg;
+        unsigned int reg2 = mc->rreg;
+        unsigned int shift = mc->shift;
         int max = mc->max;
-        uint mask = (1<<fls(max))-1;
-        uint invert = mc->invert;
+        unsigned int mask = (1<<fls(max))-1;
+        unsigned int invert = mc->invert;
 
         ucontrol->value.integer.value[0] =
                 (snd_soc_read(codec, reg) >> shift) & mask;
@@ -1631,12 +1631,12 @@ int snd_soc_put_volsw_2r(struct snd_kcontrol *kcontrol,
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-        uint reg = mc->reg;
-        uint reg2 = mc->rreg;
-        uint shift = mc->shift;
+        unsigned int reg = mc->reg;
+        unsigned int reg2 = mc->rreg;
+        unsigned int shift = mc->shift;
         int max = mc->max;
-        uint mask = (1 << fls(max)) - 1;
-        uint invert = mc->invert;
+        unsigned int mask = (1 << fls(max)) - 1;
+        unsigned int invert = mc->invert;
         int err;
         unsigned short val, val2, val_mask;
 
@@ -1701,7 +1701,7 @@ int snd_soc_get_volsw_s8(struct snd_kcontrol *kcontrol,
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-        uint reg = mc->reg;
+        unsigned int reg = mc->reg;
         int min = mc->min;
         int val = snd_soc_read(codec, reg);
 
@@ -1728,7 +1728,7 @@ int snd_soc_put_volsw_s8(struct snd_kcontrol *kcontrol,
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
         struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-        uint reg = mc->reg;
+        unsigned int reg = mc->reg;
         int min = mc->min;
         unsigned short val;
 
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index f08be8a329e9..7a88f764daf8 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -106,11 +106,11 @@ static void dapm_set_path_status(struct snd_soc_dapm_widget *w,
                 int val;
                 struct soc_mixer_control *mc = (struct soc_mixer_control *)
                         w->kcontrols[i].private_value;
-                uint reg = mc->reg;
-                uint shift = mc->shift;
+                unsigned int reg = mc->reg;
+                unsigned int shift = mc->shift;
                 int max = mc->max;
-                uint mask = (1 << fls(max)) - 1;
-                uint invert = mc->invert;
+                unsigned int mask = (1 << fls(max)) - 1;
+                unsigned int invert = mc->invert;
 
                 val = snd_soc_read(w->codec, reg);
                 val = (val >> shift) & mask;
@@ -252,11 +252,11 @@ static int dapm_set_pga(struct snd_soc_dapm_widget *widget, int power)
         if (widget->num_kcontrols && k) {
                 struct soc_mixer_control *mc =
                         (struct soc_mixer_control *)k->private_value;
-                uint reg = mc->reg;
-                uint shift = mc->shift;
+                unsigned int reg = mc->reg;
+                unsigned int shift = mc->shift;
                 int max = mc->max;
-                uint mask = (1 << fls(max)) - 1;
-                uint invert = mc->invert;
+                unsigned int mask = (1 << fls(max)) - 1;
+                unsigned int invert = mc->invert;
 
                 if (power) {
                         int i;
@@ -1141,12 +1141,12 @@ int snd_soc_dapm_get_volsw(struct snd_kcontrol *kcontrol,
         struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        uint reg = mc->reg;
-        uint shift = mc->shift;
-        uint rshift = mc->rshift;
+        unsigned int reg = mc->reg;
+        unsigned int shift = mc->shift;
+        unsigned int rshift = mc->rshift;
         int max = mc->max;
-        uint invert = mc->invert;
-        uint mask = (1 << fls(max)) - 1;
+        unsigned int invert = mc->invert;
+        unsigned int mask = (1 << fls(max)) - 1;
 
         /* return the saved value if we are powered down */
         if (widget->id == snd_soc_dapm_pga && !widget->power) {
@@ -1186,12 +1186,12 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
         struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
         struct soc_mixer_control *mc =
                 (struct soc_mixer_control *)kcontrol->private_value;
-        uint reg = mc->reg;
-        uint shift = mc->shift;
-        uint rshift = mc->rshift;
+        unsigned int reg = mc->reg;
+        unsigned int shift = mc->shift;
+        unsigned int rshift = mc->rshift;
         int max = mc->max;
-        uint mask = (1 << fls(max)) - 1;
-        uint invert = mc->invert;
+        unsigned int mask = (1 << fls(max)) - 1;
+        unsigned int invert = mc->invert;
         unsigned short val, val2, val_mask;
         int ret;