ALSA: hda: Rename back to dmic_detect option
PATCH 1/1 ALSA: hda: Rename back to dmic_detect option
We've got quite a few bug reports showing the SOF driver being loaded unintentionally recently, and the reason seems to be that users didn't know the module option change: with the recent kernel, a new option dsp_driver=1 has to be passed to a new module snd-intel-dspcfg instead of snd_hda_intel.dmic_detect=0 option.
That is, actually there are two tricky things here:
- We changed the whole detection in another module and another option semantics.
- The existing option for skipping the DSP probe was also renamed.
For avoiding the confusion and giving user more hint, this patch reverts the renamed option dsp_driver back to dmic_detect for snd-hda-intel module, and show the warning about the module option change when the non-default value is passed.
--- sound/pci/hda/hda_intel.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
sound/pci/hda/hda_intel.c +8 -5
@@ -125,7 +125,7 @@ static char *patch[SNDRV_CARDS];static bool beep_mode[SNDRV_CARDS ] = {[0 ... (SNDRV_CARDS -1 )] =CONFIG_SND_HDA_INPUT_BEEP_MODE };#endif -static bool dsp_driver =1 ; +static bool dmic_detect =1 ;module_param_array (index, int,NULL ,0444 );MODULE_PARM_DESC (index,"Index value for Intel HD audio interface." );
@@ -160,9 +160,10 @@ module_param_array(beep_mode, bool, NULL, 0444);MODULE_PARM_DESC (beep_mode,"Select HDA Beep registration mode " "(0=off, 1=on) (default=1)." );#endif -module_param (dsp_driver, bool,0444 ); -MODULE_PARM_DESC (dsp_driver,"Allow DSP driver selection (bypass this driver) " -"(0=off, 1=on) (default=1)" ); +module_param (dmic_detect, bool,0444 ); +MODULE_PARM_DESC (dmic_detect,"Allow DSP driver selection (bypass this driver) " +"(0=off, 1=on) (default=1); " +"deprecated, use snd-intel-dspcfg.dsp_driver option instead" );#ifdef CONFIG_PM static int param_set_xint (const char *val,const struct kernel_param *kp);
@@ -2099,11 +2100,13 @@ static int azx_probe(struct pci_dev *pci,/* * stop probe if another Intel's DSP driver should be activated */ -if (dsp_driver) { +if (dmic_detect) { err =snd_intel_dsp_driver_probe (pci);if (err !=SND_INTEL_DSP_DRIVER_ANY && err !=SND_INTEL_DSP_DRIVER_LEGACY )return -ENODEV ; + }else { +dev_warn (&pci->dev,"dmic_detect option is deprecated, pass snd-intel-dspcfg.dsp_driver=1 option instead\n" ); } err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
Signature · 6 lines
2.16.4 _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel