From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 29 Jan 2014 13:35:40 +0000 (+0100)
Subject: ALSA: parisc: Convert to snd_card_new() with a device pointer
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5f32c314f9c2a4e2e88de3ef23aa35580a0a19e5;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

ALSA: parisc: 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>
---

diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c
index 67f56a2cee6a..4b20be79c1dd 100644
--- a/sound/parisc/harmony.c
+++ b/sound/parisc/harmony.c
@@ -959,8 +959,6 @@ snd_harmony_create(struct snd_card *card,
                 goto free_and_ret;
         }
 
-	snd_card_set_dev(card, &padev->dev);
-
 	*rchip = h;
 
 	return 0;
@@ -977,7 +975,7 @@ snd_harmony_probe(struct parisc_device *padev)
 	struct snd_card *card;
 	struct snd_harmony *h;
 
-	err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+	err = snd_card_new(&padev->dev, index, id, THIS_MODULE, 0, &card);
 	if (err < 0)
 		return err;