From patchwork Wed Feb 12 10:35:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takashi Iwai X-Patchwork-Id: 3636701 X-Patchwork-Delegate: tiwai@suse.de Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 599A09F334 for ; Wed, 12 Feb 2014 10:43:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7522920149 for ; Wed, 12 Feb 2014 10:43:30 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 2E2D720115 for ; Wed, 12 Feb 2014 10:43:29 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 31245265573; Wed, 12 Feb 2014 11:43:28 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id D47B0265121; Wed, 12 Feb 2014 11:36:14 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id A2D2B265012; Wed, 12 Feb 2014 11:36:11 +0100 (CET) Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id F33AE26501D for ; Wed, 12 Feb 2014 11:35:50 +0100 (CET) Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 87BCBAC89 for ; Wed, 12 Feb 2014 10:35:50 +0000 (UTC) From: Takashi Iwai To: alsa-devel@alsa-project.org Date: Wed, 12 Feb 2014 11:35:27 +0100 Message-Id: <1392201340-27113-12-git-send-email-tiwai@suse.de> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1392201340-27113-1-git-send-email-tiwai@suse.de> References: <1392201340-27113-1-git-send-email-tiwai@suse.de> Subject: [alsa-devel] [PATCH 11/24] ALSA: mips: Convert to snd_card_new() with a device pointer X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai --- sound/mips/au1x00.c | 4 ++-- sound/mips/hal2.c | 3 +-- sound/mips/sgio2audio.c | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c index 9ca8fd0c2201..a1d2e27bef56 100644 --- a/sound/mips/au1x00.c +++ b/sound/mips/au1x00.c @@ -599,8 +599,8 @@ static int au1000_ac97_probe(struct platform_device *pdev) struct snd_ac97_bus *pbus; struct snd_ac97_template ac97; - err = snd_card_create(-1, "AC97", THIS_MODULE, - sizeof(struct snd_au1000), &card); + err = snd_card_new(&pdev->dev, -1, "AC97", THIS_MODULE, + sizeof(struct snd_au1000), &card); if (err < 0) goto out0; diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c index 2b7f6e8bdd24..23441b9e6148 100644 --- a/sound/mips/hal2.c +++ b/sound/mips/hal2.c @@ -880,7 +880,7 @@ static int hal2_probe(struct platform_device *pdev) struct snd_hal2 *chip; int err; - err = snd_card_create(index, id, THIS_MODULE, 0, &card); + err = snd_card_new(&pdev->dev, index, id, THIS_MODULE, 0, &card); if (err < 0) return err; @@ -889,7 +889,6 @@ static int hal2_probe(struct platform_device *pdev) snd_card_free(card); return err; } - snd_card_set_dev(card, &pdev->dev); err = hal2_pcm_create(chip); if (err < 0) { diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c index cfe99ae149fe..04bb06c03ec8 100644 --- a/sound/mips/sgio2audio.c +++ b/sound/mips/sgio2audio.c @@ -920,7 +920,7 @@ static int snd_sgio2audio_probe(struct platform_device *pdev) struct snd_sgio2audio *chip; int err; - err = snd_card_create(index, id, THIS_MODULE, 0, &card); + err = snd_card_new(&pdev->dev, index, id, THIS_MODULE, 0, &card); if (err < 0) return err; @@ -929,7 +929,6 @@ static int snd_sgio2audio_probe(struct platform_device *pdev) snd_card_free(card); return err; } - snd_card_set_dev(card, &pdev->dev); err = snd_sgio2audio_new_pcm(chip); if (err < 0) {