summaryrefslogtreecommitdiffstats
path: root/sound/spi
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-01-29 14:41:58 +0100
committerTakashi Iwai <tiwai@suse.de>2014-02-14 08:14:08 +0100
commit6e10af77143a0dda2b3631aeafda0a429917b0fe (patch)
tree510f0539ae8b6f91635432cf1f838ef6ba912b36 /sound/spi
parenta2fefc35a99f684b4ba15d243995170fa23bdd7e (diff)
downloadblackbird-op-linux-6e10af77143a0dda2b3631aeafda0a429917b0fe.tar.gz
blackbird-op-linux-6e10af77143a0dda2b3631aeafda0a429917b0fe.zip
ALSA: spi: 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/spi')
-rw-r--r--sound/spi/at73c213.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c
index 25c38afaee49..39522367897c 100644
--- a/sound/spi/at73c213.c
+++ b/sound/spi/at73c213.c
@@ -927,8 +927,6 @@ static int snd_at73c213_dev_init(struct snd_card *card,
if (retval)
goto out_snd_dev;
- snd_card_set_dev(card, &spi->dev);
-
goto out;
out_snd_dev:
@@ -966,8 +964,8 @@ static int snd_at73c213_probe(struct spi_device *spi)
/* Allocate "card" using some unused identifiers. */
snprintf(id, sizeof id, "at73c213_%d", board->ssc_id);
- retval = snd_card_create(-1, id, THIS_MODULE,
- sizeof(struct snd_at73c213), &card);
+ retval = snd_card_new(&spi->dev, -1, id, THIS_MODULE,
+ sizeof(struct snd_at73c213), &card);
if (retval < 0)
goto out;
OpenPOWER on IntegriCloud