tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Takashi Iwai 4a875580 06b45f00

+4 -8
+2 -4
sound/arm/aaci.c
··· 899 899 struct snd_card *card; 900 900 int err; 901 901 902 - err = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, 903 - THIS_MODULE, sizeof(struct aaci), &card); 902 + err = snd_card_new(&dev->dev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, 903 + THIS_MODULE, sizeof(struct aaci), &card); 904 904 if (err < 0) 905 905 return NULL; 906 906 ··· 1054 1054 ret = aaci_init_pcm(aaci); 1055 1055 if (ret) 1056 1056 goto out; 1057 - 1058 - snd_card_set_dev(aaci->card, &dev->dev); 1059 1057 1060 1058 ret = snd_card_register(aaci->card); 1061 1059 if (ret == 0) {
+2 -4
sound/arm/pxa2xx-ac97.c
··· 179 179 goto err_dev; 180 180 } 181 181 182 - ret = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, 183 - THIS_MODULE, 0, &card); 182 + ret = snd_card_new(&dev->dev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, 183 + THIS_MODULE, 0, &card); 184 184 if (ret < 0) 185 185 goto err; 186 186 187 - card->dev = &dev->dev; 188 187 strlcpy(card->driver, dev->dev.driver->name, sizeof(card->driver)); 189 188 190 189 ret = pxa2xx_pcm_new(card, &pxa2xx_ac97_pcm_client, &pxa2xx_ac97_pcm); ··· 209 210 210 211 if (pdata && pdata->codec_pdata[0]) 211 212 snd_ac97_dev_add_pdata(ac97_bus->codec[0], pdata->codec_pdata[0]); 212 - snd_card_set_dev(card, &dev->dev); 213 213 ret = snd_card_register(card); 214 214 if (ret == 0) { 215 215 platform_set_drvdata(dev, card);