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

Commit 5872f3f6 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: drivers: Convert to snd_card_new() with a device pointer 



Also remove superfluous snd_card_set_dev() calls.

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

sound/drivers/aloop.c

+2 −2
Original line number Diff line number Diff line
@@ -1142,7 +1142,7 @@ static int loopback_probe(struct platform_device *devptr) 
	int dev = devptr->id;

	int err;



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

	err = snd_card_new(&devptr->dev, index[dev], id[dev], THIS_MODULE,

			   sizeof(struct loopback), &card);

	if (err < 0)

		return err;

sound/drivers/dummy.c

+2 −4
Original line number Diff line number Diff line
@@ -1054,7 +1054,7 @@ static int snd_dummy_probe(struct platform_device *devptr) 
	int idx, err;

	int dev = devptr->id;



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

	err = snd_card_new(&devptr->dev, index[dev], id[dev], THIS_MODULE,

			   sizeof(struct snd_dummy), &card);

	if (err < 0)

		return err;
@@ -1114,8 +1114,6 @@ static int snd_dummy_probe(struct platform_device *devptr) 


	dummy_proc_init(dummy);



	snd_card_set_dev(card, &devptr->dev);



	err = snd_card_register(card);

	if (err == 0) {

		platform_set_drvdata(devptr, card);

sound/drivers/ml403-ac97cr.c

+2 −3
Original line number Diff line number Diff line
@@ -1280,7 +1280,8 @@ static int snd_ml403_ac97cr_probe(struct platform_device *pfdev) 
	if (!enable[dev])

		return -ENOENT;



	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);

	err = snd_card_new(&pfdev->dev, index[dev], id[dev], THIS_MODULE,

			   0, &card);

	if (err < 0)

		return err;

	err = snd_ml403_ac97cr_create(card, pfdev, &ml403_ac97cr);
@@ -1310,8 +1311,6 @@ static int snd_ml403_ac97cr_probe(struct platform_device *pfdev) 
		(unsigned long)ml403_ac97cr->port, ml403_ac97cr->irq,

		ml403_ac97cr->capture_irq, dev + 1);



	snd_card_set_dev(card, &pfdev->dev);



	err = snd_card_register(card);

	if (err < 0) {

		snd_card_free(card);

sound/drivers/mpu401/mpu401.c

+6 −6
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ static struct platform_device *platform_devices[SNDRV_CARDS]; 
static int pnp_registered;

static unsigned int snd_mpu401_devices;



static int snd_mpu401_create(int dev, struct snd_card **rcard)

static int snd_mpu401_create(struct device *devptr, int dev,

			     struct snd_card **rcard)

{

	struct snd_card *card;

	int err;
@@ -73,7 +74,8 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard) 
		snd_printk(KERN_ERR "the uart_enter option is obsolete; remove it\n");



	*rcard = NULL;

	err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);

	err = snd_card_new(devptr, index[dev], id[dev], THIS_MODULE,

			   0, &card);

	if (err < 0)

		return err;

	strcpy(card->driver, "MPU-401 UART");
@@ -114,10 +116,9 @@ static int snd_mpu401_probe(struct platform_device *devptr) 
		snd_printk(KERN_ERR "specify or disable IRQ\n");

		return -EINVAL;

	}

	err = snd_mpu401_create(dev, &card);

	err = snd_mpu401_create(&devptr->dev, dev, &card);

	if (err < 0)

		return err;

	snd_card_set_dev(card, &devptr->dev);

	if ((err = snd_card_register(card)) < 0) {

		snd_card_free(card);

		return err;
@@ -194,14 +195,13 @@ static int snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev, 
		err = snd_mpu401_pnp(dev, pnp_dev, id);

		if (err < 0)

			return err;

		err = snd_mpu401_create(dev, &card);

		err = snd_mpu401_create(&pnp_dev->dev, dev, &card);

		if (err < 0)

			return err;

		if ((err = snd_card_register(card)) < 0) {

			snd_card_free(card);

			return err;

		}

		snd_card_set_dev(card, &pnp_dev->dev);

		pnp_set_drvdata(pnp_dev, card);

		snd_mpu401_devices++;

		++dev;

sound/drivers/mtpav.c

+2 −2
Original line number Diff line number Diff line
@@ -697,7 +697,8 @@ static int snd_mtpav_probe(struct platform_device *dev) 
	int err;

	struct mtpav *mtp_card;



	err = snd_card_create(index, id, THIS_MODULE, sizeof(*mtp_card), &card);

	err = snd_card_new(&dev->dev, index, id, THIS_MODULE,

			   sizeof(*mtp_card), &card);

	if (err < 0)

		return err;
@@ -732,7 +733,6 @@ static int snd_mtpav_probe(struct platform_device *dev) 


	snd_mtpav_portscan(mtp_card);



	snd_card_set_dev(card, &dev->dev);

	err = snd_card_register(mtp_card->card);

	if (err < 0)

		goto __error;