diff options
author | Takashi Iwai <tiwai@alsa3.local> | 2008-12-28 10:45:02 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-01-12 09:21:19 -0500 |
commit | bd7dd77c2a05c530684eea2e3af16449ae9c5d52 (patch) | |
tree | f26e8b6c83ed58d3c2d47f9df6373812db80a885 /sound/arm | |
parent | e58de7baf7de11f01a675cbbf6ecc8a2758b9ca5 (diff) |
ALSA: Convert to snd_card_create() in other sound/*
Convert from snd_card_new() to the new snd_card_create() function
in other sound subdirectories.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/arm')
-rw-r--r-- | sound/arm/aaci.c | 7 | ||||
-rw-r--r-- | sound/arm/pxa2xx-ac97.c | 7 | ||||
-rw-r--r-- | sound/arm/sa11xx-uda1341.c | 7 |
3 files changed, 11 insertions, 10 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index 89096e811a4b..7d39aac9ec14 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c | |||
@@ -995,10 +995,11 @@ static struct aaci * __devinit aaci_init_card(struct amba_device *dev) | |||
995 | { | 995 | { |
996 | struct aaci *aaci; | 996 | struct aaci *aaci; |
997 | struct snd_card *card; | 997 | struct snd_card *card; |
998 | int err; | ||
998 | 999 | ||
999 | card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, | 1000 | err = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, |
1000 | THIS_MODULE, sizeof(struct aaci)); | 1001 | THIS_MODULE, sizeof(struct aaci), &card); |
1001 | if (card == NULL) | 1002 | if (err < 0) |
1002 | return NULL; | 1003 | return NULL; |
1003 | 1004 | ||
1004 | card->private_free = aaci_free_card; | 1005 | card->private_free = aaci_free_card; |
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 85cf591d4e11..7ed100c80a5f 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c | |||
@@ -173,10 +173,9 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev) | |||
173 | struct snd_ac97_template ac97_template; | 173 | struct snd_ac97_template ac97_template; |
174 | int ret; | 174 | int ret; |
175 | 175 | ||
176 | ret = -ENOMEM; | 176 | ret = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, |
177 | card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, | 177 | THIS_MODULE, 0, &card); |
178 | THIS_MODULE, 0); | 178 | if (ret < 0) |
179 | if (!card) | ||
180 | goto err; | 179 | goto err; |
181 | 180 | ||
182 | card->dev = &dev->dev; | 181 | card->dev = &dev->dev; |
diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c index 1dcd51d81d10..51d708c31e65 100644 --- a/sound/arm/sa11xx-uda1341.c +++ b/sound/arm/sa11xx-uda1341.c | |||
@@ -887,9 +887,10 @@ static int __devinit sa11xx_uda1341_probe(struct platform_device *devptr) | |||
887 | struct sa11xx_uda1341 *chip; | 887 | struct sa11xx_uda1341 *chip; |
888 | 888 | ||
889 | /* register the soundcard */ | 889 | /* register the soundcard */ |
890 | card = snd_card_new(-1, id, THIS_MODULE, sizeof(struct sa11xx_uda1341)); | 890 | err = snd_card_create(-1, id, THIS_MODULE, |
891 | if (card == NULL) | 891 | sizeof(struct sa11xx_uda1341), &card); |
892 | return -ENOMEM; | 892 | if (err < 0) |
893 | return err; | ||
893 | 894 | ||
894 | chip = card->private_data; | 895 | chip = card->private_data; |
895 | spin_lock_init(&chip->s[0].dma_lock); | 896 | spin_lock_init(&chip->s[0].dma_lock); |