From patchwork Tue May 6 07:39:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Peter Clausen X-Patchwork-Id: 4119761 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 881ACBFF02 for ; Tue, 6 May 2014 07:41:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A7658201C8 for ; Tue, 6 May 2014 07:41:36 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id A77D620154 for ; Tue, 6 May 2014 07:41:35 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 9503C26513A; Tue, 6 May 2014 09:41:34 +0200 (CEST) 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,NO_DNS_FOR_FROM, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 02B15261AC1; Tue, 6 May 2014 09:40:03 +0200 (CEST) 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 B3244260816; Tue, 6 May 2014 09:39:59 +0200 (CEST) Received: from smtp-out-167.synserver.de (smtp-out-016.synserver.de [212.40.185.16]) by alsa0.perex.cz (Postfix) with ESMTP id 8C35A2610C1 for ; Tue, 6 May 2014 09:39:51 +0200 (CEST) Received: (qmail 5572 invoked by uid 0); 6 May 2014 07:39:51 -0000 X-SynServer-TrustedSrc: 1 X-SynServer-AuthUser: lars@metafoo.de X-SynServer-PPID: 5231 Received: from ppp-188-174-62-33.dynamic.mnet-online.de (HELO lars-adi-laptop.fritz.box) [188.174.62.33] by 217.119.54.77 with SMTP; 6 May 2014 07:39:49 -0000 From: Lars-Peter Clausen To: Mark Brown , Liam Girdwood Date: Tue, 6 May 2014 09:39:39 +0200 Message-Id: <1399361981-18518-4-git-send-email-lars@metafoo.de> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1399361981-18518-1-git-send-email-lars@metafoo.de> References: <1399361981-18518-1-git-send-email-lars@metafoo.de> Cc: alsa-devel@alsa-project.org, Lars-Peter Clausen , Bo Shen Subject: [alsa-devel] [PATCH 3/5] ASoC: Remove unused num_dai field from CODEC 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 Commit d191bd8de8 ("ASoC: snd_soc_codec includes snd_soc_component") removed the last user of the num_dai field. Also remove the field itself. Signed-off-by: Lars-Peter Clausen --- include/sound/soc.h | 1 - sound/soc/soc-core.c | 1 - 2 files changed, 2 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 5603020..f046dcf 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -692,7 +692,6 @@ struct snd_soc_codec { struct snd_soc_card *card; struct list_head list; struct list_head card_list; - int num_dai; /* runtime */ struct snd_ac97 *ac97; /* for ad-hoc ac97 devices */ diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index cc62526..f32b3f2 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -4265,7 +4265,6 @@ int snd_soc_register_codec(struct device *dev, codec->dapm.stream_event = codec_drv->stream_event; codec->dev = dev; codec->driver = codec_drv; - codec->num_dai = num_dai; codec->component.val_bytes = codec_drv->reg_word_size; mutex_init(&codec->mutex);