diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 14:48:43 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-14 08:14:09 +0100 |
| commit | e735688875208fa2c0bec3be6692941e701c48a8 (patch) | |
| tree | 4e24136a49d244a62e4e4faddd1f62e910e6d2ef /drivers/media/usb/stk1160/stk1160-ac97.c | |
| parent | b9d4e7b0f612ecf6a0a29a046efc4828703f63c4 (diff) | |
[media] 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 'drivers/media/usb/stk1160/stk1160-ac97.c')
| -rw-r--r-- | drivers/media/usb/stk1160/stk1160-ac97.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/usb/stk1160/stk1160-ac97.c b/drivers/media/usb/stk1160/stk1160-ac97.c index c8583c262c3..c46c8be8960 100644 --- a/drivers/media/usb/stk1160/stk1160-ac97.c +++ b/drivers/media/usb/stk1160/stk1160-ac97.c @@ -98,13 +98,11 @@ int stk1160_ac97_register(struct stk1160 *dev) * Just want a card to access ac96 controls, * the actual capture interface will be handled by snd-usb-audio */ - rc = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, - THIS_MODULE, 0, &card); + rc = snd_card_new(dev->dev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, + THIS_MODULE, 0, &card); if (rc < 0) return rc; - snd_card_set_dev(card, dev->dev); - /* TODO: I'm not sure where should I get these names :-( */ snprintf(card->shortname, sizeof(card->shortname), "stk1160-mixer"); |