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/portman2x4.c | |
| parent | ALSA: Mandate to pass a device pointer at card creation time (diff) | |
| download | linux-5872f3f621f9f65342583a85ec93b00c0a697eda.tar.xz 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/portman2x4.c')
| -rw-r--r-- | sound/drivers/portman2x4.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c index 991018df7131..78ccfa455527 100644 --- a/sound/drivers/portman2x4.c +++ b/sound/drivers/portman2x4.c @@ -748,7 +748,8 @@ static int snd_portman_probe(struct platform_device *pdev) if ((err = snd_portman_probe_port(p)) < 0) return err; - err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); + err = snd_card_new(&pdev->dev, index[dev], id[dev], THIS_MODULE, + 0, &card); if (err < 0) { snd_printd("Cannot create card\n"); return err; @@ -798,8 +799,6 @@ static int snd_portman_probe(struct platform_device *pdev) platform_set_drvdata(pdev, card); - snd_card_set_dev(card, &pdev->dev); - /* At this point card will be usable */ if ((err = snd_card_register(card)) < 0) { snd_printd("Cannot register card\n"); |