diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 14:25:18 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-14 08:14:03 +0100 |
| commit | 4a87558018ca095795c937ce6f266699c5ec35ff (patch) | |
| tree | 9cd74bb74ae7042451006d02dc2a851d7eb34713 /sound | |
| parent | 06b45f00a46621e0766e37a02a9676b9143261a2 (diff) | |
| download | op-kernel-dev-4a87558018ca095795c937ce6f266699c5ec35ff.zip op-kernel-dev-4a87558018ca095795c937ce6f266699c5ec35ff.tar.gz | |
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')
| -rw-r--r-- | sound/arm/aaci.c | 6 | ||||
| -rw-r--r-- | sound/arm/pxa2xx-ac97.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index c421fdb..0e83a73 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) struct snd_card *card; int err; - err = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, - THIS_MODULE, sizeof(struct aaci), &card); + err = snd_card_new(&dev->dev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, + THIS_MODULE, sizeof(struct aaci), &card); if (err < 0) return NULL; @@ -1055,8 +1055,6 @@ static int aaci_probe(struct amba_device *dev, if (ret) goto out; - snd_card_set_dev(aaci->card, &dev->dev); - ret = snd_card_register(aaci->card); if (ret == 0) { dev_info(&dev->dev, "%s\n", aaci->card->longname); diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 9a2ac1e..3a10df6 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c @@ -179,12 +179,11 @@ static int pxa2xx_ac97_probe(struct platform_device *dev) goto err_dev; } - ret = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, - THIS_MODULE, 0, &card); + ret = snd_card_new(&dev->dev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, + THIS_MODULE, 0, &card); if (ret < 0) goto err; - card->dev = &dev->dev; strlcpy(card->driver, dev->dev.driver->name, sizeof(card->driver)); ret = pxa2xx_pcm_new(card, &pxa2xx_ac97_pcm_client, &pxa2xx_ac97_pcm); @@ -210,7 +209,6 @@ static int pxa2xx_ac97_probe(struct platform_device *dev) if (pdata && pdata->codec_pdata[0]) snd_ac97_dev_add_pdata(ac97_bus->codec[0], pdata->codec_pdata[0]); - snd_card_set_dev(card, &dev->dev); ret = snd_card_register(card); if (ret == 0) { platform_set_drvdata(dev, card); |
