diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 08:35:40 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-14 02:14:05 -0500 |
commit | 5f32c314f9c2a4e2e88de3ef23aa35580a0a19e5 (patch) | |
tree | 42fc983bc5e26f5c2f4608019266916ba6bf9452 /sound/parisc | |
parent | bee1bb19cf97413494a5254de63d43d52d93d4f8 (diff) |
ALSA: parisc: 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/parisc')
-rw-r--r-- | sound/parisc/harmony.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c index 67f56a2cee6a..4b20be79c1dd 100644 --- a/sound/parisc/harmony.c +++ b/sound/parisc/harmony.c | |||
@@ -959,8 +959,6 @@ snd_harmony_create(struct snd_card *card, | |||
959 | goto free_and_ret; | 959 | goto free_and_ret; |
960 | } | 960 | } |
961 | 961 | ||
962 | snd_card_set_dev(card, &padev->dev); | ||
963 | |||
964 | *rchip = h; | 962 | *rchip = h; |
965 | 963 | ||
966 | return 0; | 964 | return 0; |
@@ -977,7 +975,7 @@ snd_harmony_probe(struct parisc_device *padev) | |||
977 | struct snd_card *card; | 975 | struct snd_card *card; |
978 | struct snd_harmony *h; | 976 | struct snd_harmony *h; |
979 | 977 | ||
980 | err = snd_card_create(index, id, THIS_MODULE, 0, &card); | 978 | err = snd_card_new(&padev->dev, index, id, THIS_MODULE, 0, &card); |
981 | if (err < 0) | 979 | if (err < 0) |
982 | return err; | 980 | return err; |
983 | 981 | ||