From: Takashi Iwai Date: Wed, 29 Jan 2014 13:41:58 +0000 (+0100) Subject: ALSA: spi: Convert to snd_card_new() with a device pointer X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6e10af77143a0dda2b3631aeafda0a429917b0fe;p=linux-beck.git ALSA: spi: Convert to snd_card_new() with a device pointer Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai --- 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;