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

Also remove superfluous snd_card_set_dev() calls.

Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/dice.c b/sound/firewire/dice.c
index c0aa649..0c39486 100644 (file)
--- a/sound/firewire/dice.c
+++ b/sound/firewire/dice.c
@@ -1326,10 +1326,10 @@ static int dice_probe(struct fw_unit *unit, const struct ieee1394_device_id *id)
        if (err < 0)
                return err;
 
-       err = snd_card_create(-1, NULL, THIS_MODULE, sizeof(*dice), &card);
+       err = snd_card_new(&unit->device, -1, NULL, THIS_MODULE,
+                          sizeof(*dice), &card);
        if (err < 0)
                return err;
-       snd_card_set_dev(card, &unit->device);
 
        dice = card->private_data;
        dice->card = card;

diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
index fd42e6b..7ac9443 100644 (file)
--- a/sound/firewire/isight.c
+++ b/sound/firewire/isight.c
@@ -631,10 +631,10 @@ static int isight_probe(struct fw_unit *unit,
        struct isight *isight;
        int err;
 
-       err = snd_card_create(-1, NULL, THIS_MODULE, sizeof(*isight), &card);
+       err = snd_card_new(&unit->device, -1, NULL, THIS_MODULE,
+                          sizeof(*isight), &card);
        if (err < 0)
                return err;
-       snd_card_set_dev(card, &unit->device);
 
        isight = card->private_data;
        isight->card = card;

diff --git a/sound/firewire/scs1x.c b/sound/firewire/scs1x.c
index 858023c..2dba848 100644 (file)
--- a/sound/firewire/scs1x.c
+++ b/sound/firewire/scs1x.c
@@ -391,10 +391,10 @@ static int scs_probe(struct fw_unit *unit, const struct ieee1394_device_id *id)
        struct scs *scs;
        int err;
 
-       err = snd_card_create(-16, NULL, THIS_MODULE, sizeof(*scs), &card);
+       err = snd_card_new(&unit->device, -16, NULL, THIS_MODULE,
+                          sizeof(*scs), &card);
        if (err < 0)
                return err;
-       snd_card_set_dev(card, &unit->device);
 
        scs = card->private_data;
        scs->card = card;

diff --git a/sound/firewire/speakers.c b/sound/firewire/speakers.c
index cc8bc3a..9f7ef21 100644 (file)
--- a/sound/firewire/speakers.c
+++ b/sound/firewire/speakers.c
@@ -668,10 +668,10 @@ static int fwspk_probe(struct fw_unit *unit,
        u32 firmware;
        int err;
 
-       err = snd_card_create(-1, NULL, THIS_MODULE, sizeof(*fwspk), &card);
+       err = snd_card_new(&unit->device, -1, NULL, THIS_MODULE,
+                          sizeof(*fwspk), &card);
        if (err < 0)
                return err;
-       snd_card_set_dev(card, &unit->device);
 
        fwspk = card->private_data;
        fwspk->card = card;