aboutsummaryrefslogtreecommitdiffstats
path: root/sound/arm/aaci.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-01-29 08:25:18 -0500
committerTakashi Iwai <tiwai@suse.de>2014-02-14 02:14:03 -0500
commit4a87558018ca095795c937ce6f266699c5ec35ff (patch)
tree9cd74bb74ae7042451006d02dc2a851d7eb34713 /sound/arm/aaci.c
parent06b45f00a46621e0766e37a02a9676b9143261a2 (diff)
ALSA: arm: 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/arm/aaci.c')
-rw-r--r--sound/arm/aaci.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index c421fdb3c7a1..0e83a73efb16 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -899,8 +899,8 @@ static struct aaci *aaci_init_card(struct amba_device *dev)
899 struct snd_card *card; 899 struct snd_card *card;
900 int err; 900 int err;
901 901
902 err = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, 902 err = snd_card_new(&dev->dev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,
903 THIS_MODULE, sizeof(struct aaci), &card); 903 THIS_MODULE, sizeof(struct aaci), &card);
904 if (err < 0) 904 if (err < 0)
905 return NULL; 905 return NULL;
906 906
@@ -1055,8 +1055,6 @@ static int aaci_probe(struct amba_device *dev,
1055 if (ret) 1055 if (ret)
1056 goto out; 1056 goto out;
1057 1057
1058 snd_card_set_dev(aaci->card, &dev->dev);
1059
1060 ret = snd_card_register(aaci->card); 1058 ret = snd_card_register(aaci->card);
1061 if (ret == 0) { 1059 if (ret == 0) {
1062 dev_info(&dev->dev, "%s\n", aaci->card->longname); 1060 dev_info(&dev->dev, "%s\n", aaci->card->longname);