mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00:00
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>
This commit is contained in:
parent
874b8d422e
commit
06b45f00a4
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user