diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 12:59:08 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-12 10:58:20 +0100 |
commit | 5872f3f621f9f65342583a85ec93b00c0a697eda (patch) | |
tree | 6deaa1d968889986fcf84a38abb436961e613f60 /sound/drivers/dummy.c | |
parent | 393aa9c1cc514774332d7bc861307a76206e358d (diff) | |
download | linux-5872f3f621f9f65342583a85ec93b00c0a697eda.tar.gz linux-5872f3f621f9f65342583a85ec93b00c0a697eda.tar.bz2 linux-5872f3f621f9f65342583a85ec93b00c0a697eda.zip |
ALSA: drivers: 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>
Diffstat (limited to 'sound/drivers/dummy.c')
-rw-r--r-- | sound/drivers/dummy.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c index 915b4d7fbb23..fab90bd2bd51 100644 --- a/sound/drivers/dummy.c +++ b/sound/drivers/dummy.c @@ -1054,8 +1054,8 @@ static int snd_dummy_probe(struct platform_device *devptr) int idx, err; int dev = devptr->id; - err = snd_card_create(index[dev], id[dev], THIS_MODULE, - sizeof(struct snd_dummy), &card); + err = snd_card_new(&devptr->dev, index[dev], id[dev], THIS_MODULE, + sizeof(struct snd_dummy), &card); if (err < 0) return err; dummy = card->private_data; @@ -1114,8 +1114,6 @@ static int snd_dummy_probe(struct platform_device *devptr) dummy_proc_init(dummy); - snd_card_set_dev(card, &devptr->dev); - err = snd_card_register(card); if (err == 0) { platform_set_drvdata(devptr, card); |