Browse Source

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>
Takashi Iwai 11 years ago
parent
commit
06b45f00a4
4 changed files with 8 additions and 8 deletions
  1. 2 2
      sound/firewire/dice.c
  2. 2 2
      sound/firewire/isight.c
  3. 2 2
      sound/firewire/scs1x.c
  4. 2 2
      sound/firewire/speakers.c

+ 2 - 2
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)
 	if (err < 0)
 		return err;
 		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)
 	if (err < 0)
 		return err;
 		return err;
-	snd_card_set_dev(card, &unit->device);
 
 
 	dice = card->private_data;
 	dice = card->private_data;
 	dice->card = card;
 	dice->card = card;

+ 2 - 2
sound/firewire/isight.c

@@ -631,10 +631,10 @@ static int isight_probe(struct fw_unit *unit,
 	struct isight *isight;
 	struct isight *isight;
 	int err;
 	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)
 	if (err < 0)
 		return err;
 		return err;
-	snd_card_set_dev(card, &unit->device);
 
 
 	isight = card->private_data;
 	isight = card->private_data;
 	isight->card = card;
 	isight->card = card;

+ 2 - 2
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;
 	struct scs *scs;
 	int err;
 	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)
 	if (err < 0)
 		return err;
 		return err;
-	snd_card_set_dev(card, &unit->device);
 
 
 	scs = card->private_data;
 	scs = card->private_data;
 	scs->card = card;
 	scs->card = card;

+ 2 - 2
sound/firewire/speakers.c

@@ -668,10 +668,10 @@ static int fwspk_probe(struct fw_unit *unit,
 	u32 firmware;
 	u32 firmware;
 	int err;
 	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)
 	if (err < 0)
 		return err;
 		return err;
-	snd_card_set_dev(card, &unit->device);
 
 
 	fwspk = card->private_data;
 	fwspk = card->private_data;
 	fwspk->card = card;
 	fwspk->card = card;