Commit 47e03941 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: Add support for allocating AC'97 device before registering it 



In some cases it is necessary to before additional operations after the
device has been initialized and before the device is registered. This can
for example be resetting the device.

This patch introduces a new function snd_soc_alloc_ac97_codec() which is
similar to snd_soc_new_ac97_codec() except that it does not register the
device. Any users of snd_soc_alloc_ac97_codec() are responsible for calling
device_add() manually.

Fixes: 6794f709 ("ASoC: ac97: Drop delayed device registration")
Reported-by: default avatarManuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Tested-by: default avatarManuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
parent 97bf6af1

include/sound/soc.h

+1 −0
Original line number Diff line number Diff line
@@ -498,6 +498,7 @@ int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned int reg, 
				unsigned int mask, unsigned int value);



#ifdef CONFIG_SND_SOC_AC97_BUS

struct snd_ac97 *snd_soc_alloc_ac97_codec(struct snd_soc_codec *codec);

struct snd_ac97 *snd_soc_new_ac97_codec(struct snd_soc_codec *codec);

void snd_soc_free_ac97_codec(struct snd_ac97 *ac97);

sound/soc/soc-ac97.c

+30 −6
Original line number Diff line number Diff line
@@ -48,15 +48,18 @@ static void soc_ac97_device_release(struct device *dev) 
}



/**

 * snd_soc_new_ac97_codec - initailise AC97 device

 * @codec: audio codec

 * snd_soc_alloc_ac97_codec() - Allocate new a AC'97 device

 * @codec: The CODEC for which to create the AC'97 device

 *

 * Initialises AC97 codec resources for use by ad-hoc devices only.

 * Allocated a new snd_ac97 device and intializes it, but does not yet register

 * it. The caller is responsible to either call device_add(&ac97->dev) to

 * register the device, or to call put_device(&ac97->dev) to free the device.

 *

 * Returns: A snd_ac97 device or a PTR_ERR in case of an error.

 */

struct snd_ac97 *snd_soc_new_ac97_codec(struct snd_soc_codec *codec)

struct snd_ac97 *snd_soc_alloc_ac97_codec(struct snd_soc_codec *codec)

{

	struct snd_ac97 *ac97;

	int ret;



	ac97 = kzalloc(sizeof(struct snd_ac97), GFP_KERNEL);

	if (ac97 == NULL)
@@ -73,7 +76,28 @@ struct snd_ac97 *snd_soc_new_ac97_codec(struct snd_soc_codec *codec) 
		     codec->component.card->snd_card->number, 0,

		     codec->component.name);



	ret = device_register(&ac97->dev);

	device_initialize(&ac97->dev);



	return ac97;

}

EXPORT_SYMBOL(snd_soc_alloc_ac97_codec);



/**

 * snd_soc_new_ac97_codec - initailise AC97 device

 * @codec: audio codec

 *

 * Initialises AC97 codec resources for use by ad-hoc devices only.

 */

struct snd_ac97 *snd_soc_new_ac97_codec(struct snd_soc_codec *codec)

{

	struct snd_ac97 *ac97;

	int ret;



	ac97 = snd_soc_alloc_ac97_codec(codec);

	if (IS_ERR(ac97))

		return ac97;



	ret = device_add(&ac97->dev);

	if (ret) {

		put_device(&ac97->dev);

		return ERR_PTR(ret);

CRA Git | Maintained and supported by SUSTech CRA and CCSE