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/wm8985', 'asoc/fix/wm8994', 'asoc/fix/wm8996', 'asoc/fix/wm9081' and 'asoc/fix/wm9713' into asoc-linus

Mark Brown 02db17ff b23229e4

+15 -15
+7 -7
sound/soc/codecs/wm8985.c
··· 531 531 532 532 reg = snd_soc_read(codec, WM8985_EQ1_LOW_SHELF); 533 533 if (reg & WM8985_EQ3DMODE) 534 - ucontrol->value.integer.value[0] = 1; 534 + ucontrol->value.enumerated.item[0] = 1; 535 535 else 536 - ucontrol->value.integer.value[0] = 0; 536 + ucontrol->value.enumerated.item[0] = 0; 537 537 538 538 return 0; 539 539 } ··· 545 545 unsigned int regpwr2, regpwr3; 546 546 unsigned int reg_eq; 547 547 548 - if (ucontrol->value.integer.value[0] != 0 549 - && ucontrol->value.integer.value[0] != 1) 548 + if (ucontrol->value.enumerated.item[0] != 0 549 + && ucontrol->value.enumerated.item[0] != 1) 550 550 return -EINVAL; 551 551 552 552 reg_eq = snd_soc_read(codec, WM8985_EQ1_LOW_SHELF); 553 553 switch ((reg_eq & WM8985_EQ3DMODE) >> WM8985_EQ3DMODE_SHIFT) { 554 554 case 0: 555 - if (!ucontrol->value.integer.value[0]) 555 + if (!ucontrol->value.enumerated.item[0]) 556 556 return 0; 557 557 break; 558 558 case 1: 559 - if (ucontrol->value.integer.value[0]) 559 + if (ucontrol->value.enumerated.item[0]) 560 560 return 0; 561 561 break; 562 562 } ··· 573 573 /* set the desired eqmode */ 574 574 snd_soc_update_bits(codec, WM8985_EQ1_LOW_SHELF, 575 575 WM8985_EQ3DMODE_MASK, 576 - ucontrol->value.integer.value[0] 576 + ucontrol->value.enumerated.item[0] 577 577 << WM8985_EQ3DMODE_SHIFT); 578 578 /* restore DAC/ADC configuration */ 579 579 snd_soc_write(codec, WM8985_POWER_MANAGEMENT_2, regpwr2);
+2 -2
sound/soc/codecs/wm8994.c
··· 362 362 struct wm8994 *control = wm8994->wm8994; 363 363 struct wm8994_pdata *pdata = &control->pdata; 364 364 int drc = wm8994_get_drc(kcontrol->id.name); 365 - int value = ucontrol->value.integer.value[0]; 365 + int value = ucontrol->value.enumerated.item[0]; 366 366 367 367 if (drc < 0) 368 368 return drc; ··· 469 469 struct wm8994 *control = wm8994->wm8994; 470 470 struct wm8994_pdata *pdata = &control->pdata; 471 471 int block = wm8994_get_retune_mobile_block(kcontrol->id.name); 472 - int value = ucontrol->value.integer.value[0]; 472 + int value = ucontrol->value.enumerated.item[0]; 473 473 474 474 if (block < 0) 475 475 return block;
+1 -1
sound/soc/codecs/wm8996.c
··· 416 416 struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec); 417 417 struct wm8996_pdata *pdata = &wm8996->pdata; 418 418 int block = wm8996_get_retune_mobile_block(kcontrol->id.name); 419 - int value = ucontrol->value.integer.value[0]; 419 + int value = ucontrol->value.enumerated.item[0]; 420 420 421 421 if (block < 0) 422 422 return block;
+4 -4
sound/soc/codecs/wm9081.c
··· 344 344 345 345 reg = snd_soc_read(codec, WM9081_ANALOGUE_SPEAKER_2); 346 346 if (reg & WM9081_SPK_MODE) 347 - ucontrol->value.integer.value[0] = 1; 347 + ucontrol->value.enumerated.item[0] = 1; 348 348 else 349 - ucontrol->value.integer.value[0] = 0; 349 + ucontrol->value.enumerated.item[0] = 0; 350 350 351 351 return 0; 352 352 } ··· 365 365 unsigned int reg2 = snd_soc_read(codec, WM9081_ANALOGUE_SPEAKER_2); 366 366 367 367 /* Are we changing anything? */ 368 - if (ucontrol->value.integer.value[0] == 368 + if (ucontrol->value.enumerated.item[0] == 369 369 ((reg2 & WM9081_SPK_MODE) != 0)) 370 370 return 0; 371 371 ··· 373 373 if (reg_pwr & WM9081_SPK_ENA) 374 374 return -EINVAL; 375 375 376 - if (ucontrol->value.integer.value[0]) { 376 + if (ucontrol->value.enumerated.item[0]) { 377 377 /* Class AB */ 378 378 reg2 &= ~(WM9081_SPK_INV_MUTE | WM9081_OUT_SPK_CTRL); 379 379 reg2 |= WM9081_SPK_MODE;
+1 -1
sound/soc/codecs/wm9713.c
··· 1212 1212 if (IS_ERR(wm9713->ac97)) 1213 1213 return PTR_ERR(wm9713->ac97); 1214 1214 1215 - regmap = devm_regmap_init_ac97(wm9713->ac97, &wm9713_regmap_config); 1215 + regmap = regmap_init_ac97(wm9713->ac97, &wm9713_regmap_config); 1216 1216 if (IS_ERR(regmap)) { 1217 1217 snd_soc_free_ac97_codec(wm9713->ac97); 1218 1218 return PTR_ERR(regmap);