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

Commit 3a3d2afd authored by Takashi Iwai's avatar Takashi Iwai
Browse files

staging/media: 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 b029a940

drivers/staging/media/go7007/snd-go7007.c

+2 −3
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ int go7007_snd_init(struct go7007 *go) 
	spin_lock_init(&gosnd->lock);

	gosnd->hw_ptr = gosnd->w_idx = gosnd->avail = 0;

	gosnd->capturing = 0;

	ret = snd_card_create(index[dev], id[dev], THIS_MODULE, 0,

	ret = snd_card_new(go->dev, index[dev], id[dev], THIS_MODULE, 0,

			   &gosnd->card);

	if (ret < 0) {

		kfree(gosnd);
@@ -257,7 +257,6 @@ int go7007_snd_init(struct go7007 *go) 
		kfree(gosnd);

		return ret;

	}

	snd_card_set_dev(gosnd->card, go->dev);

	ret = snd_pcm_new(gosnd->card, "go7007", 0, 0, 1, &gosnd->pcm);

	if (ret < 0) {

		snd_card_free(gosnd->card);

drivers/staging/media/solo6x10/solo6x10-g723.c

+3 −3
Original line number Diff line number Diff line
@@ -366,7 +366,8 @@ int solo_g723_init(struct solo_dev *solo_dev) 
	/* Allows for easier mapping between video and audio */

	sprintf(name, "Softlogic%d", solo_dev->vfd->num);



	ret = snd_card_create(SNDRV_DEFAULT_IDX1, name, THIS_MODULE, 0,

	ret = snd_card_new(&solo_dev->pdev->dev,

			   SNDRV_DEFAULT_IDX1, name, THIS_MODULE, 0,

			   &solo_dev->snd_card);

	if (ret < 0)

		return ret;
@@ -377,7 +378,6 @@ int solo_g723_init(struct solo_dev *solo_dev) 
	strcpy(card->shortname, "SOLO-6x10 Audio");

	sprintf(card->longname, "%s on %s IRQ %d", card->shortname,

		pci_name(solo_dev->pdev), solo_dev->pdev->irq);

	snd_card_set_dev(card, &solo_dev->pdev->dev);



	ret = snd_device_new(card, SNDRV_DEV_LOWLEVEL, solo_dev, &ops);

	if (ret < 0)