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

Commit ded255be authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - consolidate chip rename functions 



A few multiple codec drivers do renaming the chip_name string but all
these are open-coded and some of them have even no error check.  Let's
make common helpers to do it properly.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 3e19fec3

include/sound/hdaudio.h

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ int snd_hdac_device_init(struct hdac_device *dev, struct hdac_bus *bus, 
void snd_hdac_device_exit(struct hdac_device *dev);

int snd_hdac_device_register(struct hdac_device *codec);

void snd_hdac_device_unregister(struct hdac_device *codec);

int snd_hdac_device_set_chip_name(struct hdac_device *codec, const char *name);



int snd_hdac_refresh_widgets(struct hdac_device *codec);

int snd_hdac_refresh_widget_sysfs(struct hdac_device *codec);

sound/hda/hdac_device.c

+22 −0
Original line number Diff line number Diff line
@@ -163,6 +163,28 @@ void snd_hdac_device_unregister(struct hdac_device *codec) 
}

EXPORT_SYMBOL_GPL(snd_hdac_device_unregister);



/**

 * snd_hdac_device_set_chip_name - set/update the codec name

 * @codec: the HDAC device

 * @name: name string to set

 *

 * Returns 0 if the name is set or updated, or a negative error code.

 */

int snd_hdac_device_set_chip_name(struct hdac_device *codec, const char *name)

{

	char *newname;



	if (!name)

		return 0;

	newname = kstrdup(name, GFP_KERNEL);

	if (!newname)

		return -ENOMEM;

	kfree(codec->chip_name);

	codec->chip_name = newname;

	return 0;

}

EXPORT_SYMBOL_GPL(snd_hdac_device_set_chip_name);



/**

 * snd_hdac_make_cmd - compose a 32bit command word to be sent to the

 *	HD-audio controller

sound/pci/hda/hda_bind.c

+23 −12
Original line number Diff line number Diff line
@@ -45,15 +45,31 @@ static void hda_codec_unsol_event(struct hdac_device *dev, unsigned int ev) 
		codec->patch_ops.unsol_event(codec, ev);

}



/* reset the codec name from the preset */

static int codec_refresh_name(struct hda_codec *codec, const char *name)

/**

 * snd_hda_codec_set_name - set the codec name

 * @codec: the HDA codec

 * @name: name string to set

 */

int snd_hda_codec_set_name(struct hda_codec *codec, const char *name)

{

	if (name) {

		kfree(codec->core.chip_name);

		codec->core.chip_name = kstrdup(name, GFP_KERNEL);

	int err;



	if (!name)

		return 0;

	err = snd_hdac_device_set_chip_name(&codec->core, name);

	if (err < 0)

		return err;



	/* update the mixer name */

	if (!*codec->card->mixername) {

		snprintf(codec->card->mixername,

			 sizeof(codec->card->mixername), "%s %s",

			 codec->core.vendor_name, codec->core.chip_name);

	}

	return codec->core.chip_name ? 0 : -ENOMEM;



	return 0;

}

EXPORT_SYMBOL_GPL(snd_hda_codec_set_name);



static int hda_codec_driver_probe(struct device *dev)

{
@@ -64,7 +80,7 @@ static int hda_codec_driver_probe(struct device *dev) 
	if (WARN_ON(!codec->preset))

		return -EINVAL;



	err = codec_refresh_name(codec, codec->preset->name);

	err = snd_hda_codec_set_name(codec, codec->preset->name);

	if (err < 0)

		goto error;

	err = snd_hdac_regmap_init(&codec->core);
@@ -251,11 +267,6 @@ int snd_hda_codec_configure(struct hda_codec *codec) 
		}

	}



	/* audio codec should override the mixer name */

	if (codec->core.afg || !*codec->card->mixername)

		snprintf(codec->card->mixername,

			 sizeof(codec->card->mixername), "%s %s",

			 codec->core.vendor_name, codec->core.chip_name);

	return 0;



 error:

sound/pci/hda/hda_codec.h

+2 −0
Original line number Diff line number Diff line
@@ -463,6 +463,8 @@ void snd_hda_unlock_devices(struct hda_bus *bus); 
void snd_hda_bus_reset(struct hda_bus *bus);

void snd_hda_bus_reset_codecs(struct hda_bus *bus);



int snd_hda_codec_set_name(struct hda_codec *codec, const char *name);



/*

 * power management

 */

sound/pci/hda/hda_sysfs.c

+1 −2
Original line number Diff line number Diff line
@@ -595,8 +595,7 @@ static void parse_model_mode(char *buf, struct hda_bus *bus, 
static void parse_chip_name_mode(char *buf, struct hda_bus *bus,

				 struct hda_codec **codecp)

{

	kfree((*codecp)->core.chip_name);

	(*codecp)->core.chip_name = kstrdup(buf, GFP_KERNEL);

	snd_hda_codec_set_name(*codecp, buf);

}



#define DEFINE_PARSE_ID_MODE(name) \