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

Commit 321051f5 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into for-linus

parents d9ab3443 cbbf50b2

sound/pci/hda/hda_codec.c

+5 −5
Original line number Diff line number Diff line
@@ -2134,10 +2134,10 @@ int snd_hda_codec_reset(struct hda_codec *codec) 
 * This function returns zero if successful or a negative error code.

 */

int snd_hda_add_vmaster(struct hda_codec *codec, char *name,

			unsigned int *tlv, const char **slaves)

			unsigned int *tlv, const char * const *slaves)

{

	struct snd_kcontrol *kctl;

	const char **s;

	const char * const *s;

	int err;



	for (s = slaves; *s && !snd_hda_find_mixer_ctl(codec, *s); s++)
@@ -3689,7 +3689,7 @@ EXPORT_SYMBOL_HDA(snd_hda_build_pcms); 
 * If no entries are matching, the function returns a negative value.

 */

int snd_hda_check_board_config(struct hda_codec *codec,

			       int num_configs, const char **models,

			       int num_configs, const char * const *models,

			       const struct snd_pci_quirk *tbl)

{

	if (codec->modelname && models) {
@@ -3753,7 +3753,7 @@ EXPORT_SYMBOL_HDA(snd_hda_check_board_config); 
 * If no entries are matching, the function returns a negative value.

 */

int snd_hda_check_board_codec_sid_config(struct hda_codec *codec,

			       int num_configs, const char **models,

			       int num_configs, const char * const *models,

			       const struct snd_pci_quirk *tbl)

{

	const struct snd_pci_quirk *q;
@@ -4690,7 +4690,7 @@ const char *hda_get_input_pin_label(struct hda_codec *codec, hda_nid_t pin, 
					int check_location)

{

	unsigned int def_conf;

	static const char *mic_names[] = {

	static const char * const mic_names[] = {

		"Internal Mic", "Dock Mic", "Mic", "Front Mic", "Rear Mic",

	};

	int attr;

sound/pci/hda/hda_generic.c

+4 −3
Original line number Diff line number Diff line
@@ -762,7 +762,8 @@ static int check_existing_control(struct hda_codec *codec, const char *type, con 
/*

 * build output mixer controls

 */

static int create_output_mixers(struct hda_codec *codec, const char **names)

static int create_output_mixers(struct hda_codec *codec,

				const char * const *names)

{

	struct hda_gspec *spec = codec->spec;

	int i, err;
@@ -780,8 +781,8 @@ static int create_output_mixers(struct hda_codec *codec, const char **names) 
static int build_output_controls(struct hda_codec *codec)

{

	struct hda_gspec *spec = codec->spec;

	static const char *types_speaker[] = { "Speaker", "Headphone" };

	static const char *types_line[] = { "Front", "Headphone" };

	static const char * const types_speaker[] = { "Speaker", "Headphone" };

	static const char * const types_line[] = { "Front", "Headphone" };



	switch (spec->pcm_vol_nodes) {

	case 1:

sound/pci/hda/hda_intel.c

+2 −0
Original line number Diff line number Diff line
@@ -2809,6 +2809,8 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { 
#endif

	/* Vortex86MX */

	{ PCI_DEVICE(0x17f3, 0x3010), .driver_data = AZX_DRIVER_GENERIC },

	/* VMware HDAudio */

	{ PCI_DEVICE(0x15ad, 0x1977), .driver_data = AZX_DRIVER_GENERIC },

	/* AMD/ATI Generic, PCI class code and Vendor ID for HD Audio */

	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_ANY_ID),

	  .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8,

sound/pci/hda/hda_local.h

+3 −3
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ void snd_hda_set_vmaster_tlv(struct hda_codec *codec, hda_nid_t nid, int dir, 
struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec,

					    const char *name);

int snd_hda_add_vmaster(struct hda_codec *codec, char *name,

			unsigned int *tlv, const char **slaves);

			unsigned int *tlv, const char * const *slaves);

int snd_hda_codec_reset(struct hda_codec *codec);



/* amp value bits */
@@ -341,10 +341,10 @@ void snd_print_pcm_bits(int pcm, char *buf, int buflen); 
 * Misc

 */

int snd_hda_check_board_config(struct hda_codec *codec, int num_configs,

			       const char **modelnames,

			       const char * const *modelnames,

			       const struct snd_pci_quirk *pci_list);

int snd_hda_check_board_codec_sid_config(struct hda_codec *codec,

                               int num_configs, const char **models,

                               int num_configs, const char * const *models,

                               const struct snd_pci_quirk *tbl);

int snd_hda_add_new_ctls(struct hda_codec *codec,

			 struct snd_kcontrol_new *knew);

sound/pci/hda/hda_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ static void print_digital_conv(struct snd_info_buffer *buffer, 


static const char *get_pwr_state(u32 state)

{

	static const char *buf[4] = {

	static const char * const buf[4] = {

		"D0", "D1", "D2", "D3"

	};

	if (state < 4)