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

Commit bd7dd77c authored by Takashi Iwai's avatar Takashi Iwai Committed by Takashi Iwai
Browse files

ALSA: Convert to snd_card_create() in other sound/* 



Convert from snd_card_new() to the new snd_card_create() function
in other sound subdirectories.

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

sound/aoa/core/alsa.c

+4 −3
Original line number Diff line number Diff line
@@ -23,9 +23,10 @@ int aoa_alsa_init(char *name, struct module *mod, struct device *dev) 
		/* cannot be EEXIST due to usage in aoa_fabric_register */

		return -EBUSY;



	alsa_card = snd_card_new(index, name, mod, sizeof(struct aoa_card));

	if (!alsa_card)

		return -ENOMEM;

	err = snd_card_create(index, name, mod, sizeof(struct aoa_card),

			      &alsa_card);

	if (err < 0)

		return err;

	aoa_card = alsa_card->private_data;

	aoa_card->alsa_card = alsa_card;

	alsa_card->dev = dev;

sound/arm/aaci.c

+4 −3
Original line number Diff line number Diff line
@@ -995,10 +995,11 @@ static struct aaci * __devinit aaci_init_card(struct amba_device *dev) 
{

	struct aaci *aaci;

	struct snd_card *card;

	int err;



	card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,

			    THIS_MODULE, sizeof(struct aaci));

	if (card == NULL)

	err = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,

			      THIS_MODULE, sizeof(struct aaci), &card);

	if (err < 0)

		return NULL;



	card->private_free = aaci_free_card;

sound/arm/pxa2xx-ac97.c

+3 −4
Original line number Diff line number Diff line
@@ -173,10 +173,9 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev) 
	struct snd_ac97_template ac97_template;

	int ret;



	ret = -ENOMEM;

	card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,

			    THIS_MODULE, 0);

	if (!card)

	ret = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,

			      THIS_MODULE, 0, &card);

	if (ret < 0)

		goto err;



	card->dev = &dev->dev;

sound/arm/sa11xx-uda1341.c

+4 −3
Original line number Diff line number Diff line
@@ -887,9 +887,10 @@ static int __devinit sa11xx_uda1341_probe(struct platform_device *devptr) 
	struct sa11xx_uda1341 *chip;



	/* register the soundcard */

	card = snd_card_new(-1, id, THIS_MODULE, sizeof(struct sa11xx_uda1341));

	if (card == NULL)

		return -ENOMEM;

	err = snd_card_create(-1, id, THIS_MODULE,

			      sizeof(struct sa11xx_uda1341), &card);

	if (err < 0)

		return err;



	chip = card->private_data;

	spin_lock_init(&chip->s[0].dma_lock);

sound/drivers/dummy.c

+4 −4
Original line number Diff line number Diff line
@@ -588,10 +588,10 @@ static int __devinit snd_dummy_probe(struct platform_device *devptr) 
	int idx, err;

	int dev = devptr->id;



	card = snd_card_new(index[dev], id[dev], THIS_MODULE,

			    sizeof(struct snd_dummy));

	if (card == NULL)

		return -ENOMEM;

	err = snd_card_create(index[dev], id[dev], THIS_MODULE,

			      sizeof(struct snd_dummy), &card);

	if (err < 0)

		return err;

	dummy = card->private_data;

	dummy->card = card;

	for (idx = 0; idx < MAX_PCM_DEVICES && idx < pcm_devs[dev]; idx++) {