Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e62a42ae authored by Dylan Reid's avatar Dylan Reid Committed by Takashi Iwai
Browse files

ALSA: hda - Pass max_slots and power_save to codec_create 



Passing the max slots and power save arguments to codec_create will
allow for its reuse by an hda_platform driver. It makes the function
independent of the module params in hda_intel and ready to move to
hda_shared in a following commit.

Signed-off-by: default avatarDylan Reid <dgreid@chromium.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 749ee287

sound/pci/hda/hda_intel.c

+17 −11
Original line number Original line Diff line number Diff line
@@ -128,6 +128,7 @@ static struct kernel_param_ops param_ops_xint = { 
#define param_check_xint param_check_int

#define param_check_xint param_check_int





static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;

static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT;

static int *power_save_addr = &power_save;

module_param(power_save, xint, 0644);

module_param(power_save, xint, 0644);

MODULE_PARM_DESC(power_save, "Automatic power-saving timeout "

MODULE_PARM_DESC(power_save, "Automatic power-saving timeout "

		 "(in second, 0 = disable).");

		 "(in second, 0 = disable).");
@@ -139,6 +140,8 @@ MODULE_PARM_DESC(power_save, "Automatic power-saving timeout " 
static bool power_save_controller = 1;

static bool power_save_controller = 1;

module_param(power_save_controller, bool, 0644);

module_param(power_save_controller, bool, 0644);

MODULE_PARM_DESC(power_save_controller, "Reset controller in power save mode.");

MODULE_PARM_DESC(power_save_controller, "Reset controller in power save mode.");

#else

static int *power_save_addr;

#endif /* CONFIG_PM */

#endif /* CONFIG_PM */





static int align_buffer_size = -1;

static int align_buffer_size = -1;
@@ -1347,17 +1350,12 @@ static int get_jackpoll_interval(struct azx *chip) 
 * Codec initialization

 * Codec initialization

 */

 */





/* number of codec slots for each chipset: 0 = default slots (i.e. 4) */

static int azx_codec_create(struct azx *chip, const char *model,

static unsigned int azx_max_codecs[AZX_NUM_DRIVERS] = {

			    unsigned int max_slots,

	[AZX_DRIVER_NVIDIA] = 8,

			    int *power_save_to)

	[AZX_DRIVER_TERA] = 1,

};



static int azx_codec_create(struct azx *chip, const char *model)

{

{

	struct hda_bus_template bus_temp;

	struct hda_bus_template bus_temp;

	int c, codecs, err;

	int c, codecs, err;

	int max_slots;





	memset(&bus_temp, 0, sizeof(bus_temp));

	memset(&bus_temp, 0, sizeof(bus_temp));

	bus_temp.private_data = chip;

	bus_temp.private_data = chip;
@@ -1368,7 +1366,7 @@ static int azx_codec_create(struct azx *chip, const char *model) 
	bus_temp.ops.attach_pcm = azx_attach_pcm_stream;

	bus_temp.ops.attach_pcm = azx_attach_pcm_stream;

	bus_temp.ops.bus_reset = azx_bus_reset;

	bus_temp.ops.bus_reset = azx_bus_reset;

#ifdef CONFIG_PM

#ifdef CONFIG_PM

	bus_temp.power_save = &power_save;

	bus_temp.power_save = power_save_to;

	bus_temp.ops.pm_notify = azx_power_notify;

	bus_temp.ops.pm_notify = azx_power_notify;

#endif

#endif

#ifdef CONFIG_SND_HDA_DSP_LOADER

#ifdef CONFIG_SND_HDA_DSP_LOADER
@@ -1387,7 +1385,6 @@ static int azx_codec_create(struct azx *chip, const char *model) 
	}

	}





	codecs = 0;

	codecs = 0;

	max_slots = azx_max_codecs[chip->driver_type];

	if (!max_slots)

	if (!max_slots)

		max_slots = AZX_DEFAULT_CODECS;

		max_slots = AZX_DEFAULT_CODECS;
@@ -3568,6 +3565,12 @@ static int azx_probe(struct pci_dev *pci, 
	return err;

	return err;

}

}





/* number of codec slots for each chipset: 0 = default slots (i.e. 4) */

static unsigned int azx_max_codecs[AZX_NUM_DRIVERS] = {

	[AZX_DRIVER_NVIDIA] = 8,

	[AZX_DRIVER_TERA] = 1,

};



static int azx_probe_continue(struct azx *chip)

static int azx_probe_continue(struct azx *chip)

{

{

	struct pci_dev *pci = chip->pci;

	struct pci_dev *pci = chip->pci;
@@ -3596,7 +3599,10 @@ static int azx_probe_continue(struct azx *chip) 
#endif

#endif





	/* create codec instances */

	/* create codec instances */

	err = azx_codec_create(chip, model[dev]);

	err = azx_codec_create(chip, model[dev],

			       azx_max_codecs[chip->driver_type],

			       power_save_addr);



	if (err < 0)

	if (err < 0)

		goto out_free;

		goto out_free;

#ifdef CONFIG_SND_HDA_PATCH_LOADER

#ifdef CONFIG_SND_HDA_PATCH_LOADER