tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge remote-tracking branches 'asoc/fix/jack', 'asoc/fix/max98088', 'asoc/fix/max98095', 'asoc/fix/omap', 'asoc/fix/pxa' and 'asoc/fix/qcom-be' into asoc-linus

Mark Brown 3b22371e 92e9f773

+52 -53
+4 -4
include/trace/events/asoc.h
··· 231 231 TP_ARGS(jack, mask, val), 232 232 233 233 TP_STRUCT__entry( 234 - __string( name, jack->jack->name ) 234 + __string( name, jack->jack->id ) 235 235 __field( int, mask ) 236 236 __field( int, val ) 237 237 ), 238 238 239 239 TP_fast_assign( 240 - __assign_str(name, jack->jack->name); 240 + __assign_str(name, jack->jack->id); 241 241 __entry->mask = mask; 242 242 __entry->val = val; 243 243 ), ··· 253 253 TP_ARGS(jack, val), 254 254 255 255 TP_STRUCT__entry( 256 - __string( name, jack->jack->name ) 256 + __string( name, jack->jack->id ) 257 257 __field( int, val ) 258 258 ), 259 259 260 260 TP_fast_assign( 261 - __assign_str(name, jack->jack->name); 261 + __assign_str(name, jack->jack->id); 262 262 __entry->val = val; 263 263 ), 264 264
+1 -1
sound/soc/codecs/max98088.c
··· 1496 1496 struct max98088_pdata *pdata = max98088->pdata; 1497 1497 int channel = max98088_get_channel(codec, kcontrol->id.name); 1498 1498 struct max98088_cdata *cdata; 1499 - int sel = ucontrol->value.integer.value[0]; 1499 + int sel = ucontrol->value.enumerated.item[0]; 1500 1500 1501 1501 if (channel < 0) 1502 1502 return channel;
+2 -2
sound/soc/codecs/max98095.c
··· 1499 1499 struct max98095_pdata *pdata = max98095->pdata; 1500 1500 int channel = max98095_get_eq_channel(kcontrol->id.name); 1501 1501 struct max98095_cdata *cdata; 1502 - unsigned int sel = ucontrol->value.integer.value[0]; 1502 + unsigned int sel = ucontrol->value.enumerated.item[0]; 1503 1503 struct max98095_eq_cfg *coef_set; 1504 1504 int fs, best, best_val, i; 1505 1505 int regmask, regsave; ··· 1653 1653 struct max98095_pdata *pdata = max98095->pdata; 1654 1654 int channel = max98095_get_bq_channel(codec, kcontrol->id.name); 1655 1655 struct max98095_cdata *cdata; 1656 - unsigned int sel = ucontrol->value.integer.value[0]; 1656 + unsigned int sel = ucontrol->value.enumerated.item[0]; 1657 1657 struct max98095_biquad_cfg *coef_set; 1658 1658 int fs, best, best_val, i; 1659 1659 int regmask, regsave;
+9 -9
sound/soc/omap/n810.c
··· 133 133 static int n810_get_spk(struct snd_kcontrol *kcontrol, 134 134 struct snd_ctl_elem_value *ucontrol) 135 135 { 136 - ucontrol->value.integer.value[0] = n810_spk_func; 136 + ucontrol->value.enumerated.item[0] = n810_spk_func; 137 137 138 138 return 0; 139 139 } ··· 143 143 { 144 144 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); 145 145 146 - if (n810_spk_func == ucontrol->value.integer.value[0]) 146 + if (n810_spk_func == ucontrol->value.enumerated.item[0]) 147 147 return 0; 148 148 149 - n810_spk_func = ucontrol->value.integer.value[0]; 149 + n810_spk_func = ucontrol->value.enumerated.item[0]; 150 150 n810_ext_control(&card->dapm); 151 151 152 152 return 1; ··· 155 155 static int n810_get_jack(struct snd_kcontrol *kcontrol, 156 156 struct snd_ctl_elem_value *ucontrol) 157 157 { 158 - ucontrol->value.integer.value[0] = n810_jack_func; 158 + ucontrol->value.enumerated.item[0] = n810_jack_func; 159 159 160 160 return 0; 161 161 } ··· 165 165 { 166 166 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); 167 167 168 - if (n810_jack_func == ucontrol->value.integer.value[0]) 168 + if (n810_jack_func == ucontrol->value.enumerated.item[0]) 169 169 return 0; 170 170 171 - n810_jack_func = ucontrol->value.integer.value[0]; 171 + n810_jack_func = ucontrol->value.enumerated.item[0]; 172 172 n810_ext_control(&card->dapm); 173 173 174 174 return 1; ··· 177 177 static int n810_get_input(struct snd_kcontrol *kcontrol, 178 178 struct snd_ctl_elem_value *ucontrol) 179 179 { 180 - ucontrol->value.integer.value[0] = n810_dmic_func; 180 + ucontrol->value.enumerated.item[0] = n810_dmic_func; 181 181 182 182 return 0; 183 183 } ··· 187 187 { 188 188 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); 189 189 190 - if (n810_dmic_func == ucontrol->value.integer.value[0]) 190 + if (n810_dmic_func == ucontrol->value.enumerated.item[0]) 191 191 return 0; 192 192 193 - n810_dmic_func = ucontrol->value.integer.value[0]; 193 + n810_dmic_func = ucontrol->value.enumerated.item[0]; 194 194 n810_ext_control(&card->dapm); 195 195 196 196 return 1;
+9 -9
sound/soc/omap/rx51.c
··· 132 132 static int rx51_get_spk(struct snd_kcontrol *kcontrol, 133 133 struct snd_ctl_elem_value *ucontrol) 134 134 { 135 - ucontrol->value.integer.value[0] = rx51_spk_func; 135 + ucontrol->value.enumerated.item[0] = rx51_spk_func; 136 136 137 137 return 0; 138 138 } ··· 142 142 { 143 143 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); 144 144 145 - if (rx51_spk_func == ucontrol->value.integer.value[0]) 145 + if (rx51_spk_func == ucontrol->value.enumerated.item[0]) 146 146 return 0; 147 147 148 - rx51_spk_func = ucontrol->value.integer.value[0]; 148 + rx51_spk_func = ucontrol->value.enumerated.item[0]; 149 149 rx51_ext_control(&card->dapm); 150 150 151 151 return 1; ··· 180 180 static int rx51_get_input(struct snd_kcontrol *kcontrol, 181 181 struct snd_ctl_elem_value *ucontrol) 182 182 { 183 - ucontrol->value.integer.value[0] = rx51_dmic_func; 183 + ucontrol->value.enumerated.item[0] = rx51_dmic_func; 184 184 185 185 return 0; 186 186 } ··· 190 190 { 191 191 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); 192 192 193 - if (rx51_dmic_func == ucontrol->value.integer.value[0]) 193 + if (rx51_dmic_func == ucontrol->value.enumerated.item[0]) 194 194 return 0; 195 195 196 - rx51_dmic_func = ucontrol->value.integer.value[0]; 196 + rx51_dmic_func = ucontrol->value.enumerated.item[0]; 197 197 rx51_ext_control(&card->dapm); 198 198 199 199 return 1; ··· 202 202 static int rx51_get_jack(struct snd_kcontrol *kcontrol, 203 203 struct snd_ctl_elem_value *ucontrol) 204 204 { 205 - ucontrol->value.integer.value[0] = rx51_jack_func; 205 + ucontrol->value.enumerated.item[0] = rx51_jack_func; 206 206 207 207 return 0; 208 208 } ··· 212 212 { 213 213 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); 214 214 215 - if (rx51_jack_func == ucontrol->value.integer.value[0]) 215 + if (rx51_jack_func == ucontrol->value.enumerated.item[0]) 216 216 return 0; 217 217 218 - rx51_jack_func = ucontrol->value.integer.value[0]; 218 + rx51_jack_func = ucontrol->value.enumerated.item[0]; 219 219 rx51_ext_control(&card->dapm); 220 220 221 221 return 1;
+6 -6
sound/soc/pxa/corgi.c
··· 163 163 static int corgi_get_jack(struct snd_kcontrol *kcontrol, 164 164 struct snd_ctl_elem_value *ucontrol) 165 165 { 166 - ucontrol->value.integer.value[0] = corgi_jack_func; 166 + ucontrol->value.enumerated.item[0] = corgi_jack_func; 167 167 return 0; 168 168 } 169 169 ··· 172 172 { 173 173 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); 174 174 175 - if (corgi_jack_func == ucontrol->value.integer.value[0]) 175 + if (corgi_jack_func == ucontrol->value.enumerated.item[0]) 176 176 return 0; 177 177 178 - corgi_jack_func = ucontrol->value.integer.value[0]; 178 + corgi_jack_func = ucontrol->value.enumerated.item[0]; 179 179 corgi_ext_control(&card->dapm); 180 180 return 1; 181 181 } ··· 183 183 static int corgi_get_spk(struct snd_kcontrol *kcontrol, 184 184 struct snd_ctl_elem_value *ucontrol) 185 185 { 186 - ucontrol->value.integer.value[0] = corgi_spk_func; 186 + ucontrol->value.enumerated.item[0] = corgi_spk_func; 187 187 return 0; 188 188 } 189 189 ··· 192 192 { 193 193 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); 194 194 195 - if (corgi_spk_func == ucontrol->value.integer.value[0]) 195 + if (corgi_spk_func == ucontrol->value.enumerated.item[0]) 196 196 return 0; 197 197 198 - corgi_spk_func = ucontrol->value.integer.value[0]; 198 + corgi_spk_func = ucontrol->value.enumerated.item[0]; 199 199 corgi_ext_control(&card->dapm); 200 200 return 1; 201 201 }
+3 -3
sound/soc/pxa/magician.c
··· 308 308 static int magician_get_input(struct snd_kcontrol *kcontrol, 309 309 struct snd_ctl_elem_value *ucontrol) 310 310 { 311 - ucontrol->value.integer.value[0] = magician_in_sel; 311 + ucontrol->value.enumerated.item[0] = magician_in_sel; 312 312 return 0; 313 313 } 314 314 315 315 static int magician_set_input(struct snd_kcontrol *kcontrol, 316 316 struct snd_ctl_elem_value *ucontrol) 317 317 { 318 - if (magician_in_sel == ucontrol->value.integer.value[0]) 318 + if (magician_in_sel == ucontrol->value.enumerated.item[0]) 319 319 return 0; 320 320 321 - magician_in_sel = ucontrol->value.integer.value[0]; 321 + magician_in_sel = ucontrol->value.enumerated.item[0]; 322 322 323 323 switch (magician_in_sel) { 324 324 case MAGICIAN_MIC:
+6 -6
sound/soc/pxa/poodle.c
··· 138 138 static int poodle_get_jack(struct snd_kcontrol *kcontrol, 139 139 struct snd_ctl_elem_value *ucontrol) 140 140 { 141 - ucontrol->value.integer.value[0] = poodle_jack_func; 141 + ucontrol->value.enumerated.item[0] = poodle_jack_func; 142 142 return 0; 143 143 } 144 144 ··· 147 147 { 148 148 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); 149 149 150 - if (poodle_jack_func == ucontrol->value.integer.value[0]) 150 + if (poodle_jack_func == ucontrol->value.enumerated.item[0]) 151 151 return 0; 152 152 153 - poodle_jack_func = ucontrol->value.integer.value[0]; 153 + poodle_jack_func = ucontrol->value.enumerated.item[0]; 154 154 poodle_ext_control(&card->dapm); 155 155 return 1; 156 156 } ··· 158 158 static int poodle_get_spk(struct snd_kcontrol *kcontrol, 159 159 struct snd_ctl_elem_value *ucontrol) 160 160 { 161 - ucontrol->value.integer.value[0] = poodle_spk_func; 161 + ucontrol->value.enumerated.item[0] = poodle_spk_func; 162 162 return 0; 163 163 } 164 164 ··· 167 167 { 168 168 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); 169 169 170 - if (poodle_spk_func == ucontrol->value.integer.value[0]) 170 + if (poodle_spk_func == ucontrol->value.enumerated.item[0]) 171 171 return 0; 172 172 173 - poodle_spk_func = ucontrol->value.integer.value[0]; 173 + poodle_spk_func = ucontrol->value.enumerated.item[0]; 174 174 poodle_ext_control(&card->dapm); 175 175 return 1; 176 176 }
+6 -6
sound/soc/pxa/spitz.c
··· 164 164 static int spitz_get_jack(struct snd_kcontrol *kcontrol, 165 165 struct snd_ctl_elem_value *ucontrol) 166 166 { 167 - ucontrol->value.integer.value[0] = spitz_jack_func; 167 + ucontrol->value.enumerated.item[0] = spitz_jack_func; 168 168 return 0; 169 169 } 170 170 ··· 173 173 { 174 174 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); 175 175 176 - if (spitz_jack_func == ucontrol->value.integer.value[0]) 176 + if (spitz_jack_func == ucontrol->value.enumerated.item[0]) 177 177 return 0; 178 178 179 - spitz_jack_func = ucontrol->value.integer.value[0]; 179 + spitz_jack_func = ucontrol->value.enumerated.item[0]; 180 180 spitz_ext_control(&card->dapm); 181 181 return 1; 182 182 } ··· 184 184 static int spitz_get_spk(struct snd_kcontrol *kcontrol, 185 185 struct snd_ctl_elem_value *ucontrol) 186 186 { 187 - ucontrol->value.integer.value[0] = spitz_spk_func; 187 + ucontrol->value.enumerated.item[0] = spitz_spk_func; 188 188 return 0; 189 189 } 190 190 ··· 193 193 { 194 194 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); 195 195 196 - if (spitz_spk_func == ucontrol->value.integer.value[0]) 196 + if (spitz_spk_func == ucontrol->value.enumerated.item[0]) 197 197 return 0; 198 198 199 - spitz_spk_func = ucontrol->value.integer.value[0]; 199 + spitz_spk_func = ucontrol->value.enumerated.item[0]; 200 200 spitz_ext_control(&card->dapm); 201 201 return 1; 202 202 }
+6 -6
sound/soc/pxa/tosa.c
··· 95 95 static int tosa_get_jack(struct snd_kcontrol *kcontrol, 96 96 struct snd_ctl_elem_value *ucontrol) 97 97 { 98 - ucontrol->value.integer.value[0] = tosa_jack_func; 98 + ucontrol->value.enumerated.item[0] = tosa_jack_func; 99 99 return 0; 100 100 } 101 101 ··· 104 104 { 105 105 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); 106 106 107 - if (tosa_jack_func == ucontrol->value.integer.value[0]) 107 + if (tosa_jack_func == ucontrol->value.enumerated.item[0]) 108 108 return 0; 109 109 110 - tosa_jack_func = ucontrol->value.integer.value[0]; 110 + tosa_jack_func = ucontrol->value.enumerated.item[0]; 111 111 tosa_ext_control(&card->dapm); 112 112 return 1; 113 113 } ··· 115 115 static int tosa_get_spk(struct snd_kcontrol *kcontrol, 116 116 struct snd_ctl_elem_value *ucontrol) 117 117 { 118 - ucontrol->value.integer.value[0] = tosa_spk_func; 118 + ucontrol->value.enumerated.item[0] = tosa_spk_func; 119 119 return 0; 120 120 } 121 121 ··· 124 124 { 125 125 struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); 126 126 127 - if (tosa_spk_func == ucontrol->value.integer.value[0]) 127 + if (tosa_spk_func == ucontrol->value.enumerated.item[0]) 128 128 return 0; 129 129 130 - tosa_spk_func = ucontrol->value.integer.value[0]; 130 + tosa_spk_func = ucontrol->value.enumerated.item[0]; 131 131 tosa_ext_control(&card->dapm); 132 132 return 1; 133 133 }
-1
sound/soc/qcom/lpass-cpu.c
··· 355 355 .readable_reg = lpass_cpu_regmap_readable, 356 356 .volatile_reg = lpass_cpu_regmap_volatile, 357 357 .cache_type = REGCACHE_FLAT, 358 - .val_format_endian = REGMAP_ENDIAN_LITTLE, 359 358 }; 360 359 361 360 int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev)