staging/media: Convert to snd_card_new() with a device pointer

Also remove superfluous snd_card_set_dev() calls.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/drivers/staging/media/go7007/snd-go7007.c b/drivers/staging/media/go7007/snd-go7007.c
index 16dd64920767de37662a63dfb400ddd2298bd33b..9eb2a20ae40a97916721599bbd80bfc04190e795 100644 (file)
--- a/drivers/staging/media/go7007/snd-go7007.c
+++ b/drivers/staging/media/go7007/snd-go7007.c
@@ -245,8 +245,8 @@ 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,
-                             &gosnd->card);
+       ret = snd_card_new(go->dev, index[dev], id[dev], THIS_MODULE, 0,
+                          &gosnd->card);
        if (ret < 0) {
                kfree(gosnd);
                return ret;
@@ -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);

diff --git a/drivers/staging/media/solo6x10/solo6x10-g723.c b/drivers/staging/media/solo6x10/solo6x10-g723.c
index 1db18c7972a00cfc6db7c94d824f1e7b03676d4c..74f037b6166c2a3f15510914cfff6b70451ccedf 100644 (file)
--- a/drivers/staging/media/solo6x10/solo6x10-g723.c
+++ b/drivers/staging/media/solo6x10/solo6x10-g723.c
@@ -366,8 +366,9 @@ 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,
-                             &solo_dev->snd_card);
+       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)