From patchwork Thu Apr 24 11:13:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 4049531 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 400449F3E2 for ; Thu, 24 Apr 2014 11:13:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 80252201BA for ; Thu, 24 Apr 2014 11:13:23 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 41807201B4 for ; Thu, 24 Apr 2014 11:13:22 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id ED3062652CE; Thu, 24 Apr 2014 13:13:20 +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, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 51387265272; Thu, 24 Apr 2014 13:12:39 +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 B368726524C; Thu, 24 Apr 2014 13:12:35 +0200 (CEST) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1lp0139.outbound.protection.outlook.com [207.46.163.139]) by alsa0.perex.cz (Postfix) with ESMTP id A1593265200 for ; Thu, 24 Apr 2014 13:12:23 +0200 (CEST) Received: from DM2PR03CA002.namprd03.prod.outlook.com (10.141.52.150) by SN2PR03MB032.namprd03.prod.outlook.com (10.255.175.42) with Microsoft SMTP Server (TLS) id 15.0.921.12; Thu, 24 Apr 2014 11:12:21 +0000 Received: from BL2FFO11FD033.protection.gbl (2a01:111:f400:7c09::116) by DM2PR03CA002.outlook.office365.com (2a01:111:e400:2414::22) with Microsoft SMTP Server (TLS) id 15.0.929.12 via Frontend Transport; Thu, 24 Apr 2014 11:12:21 +0000 Received: from az84smr01.freescale.net (192.88.158.246) by BL2FFO11FD033.mail.protection.outlook.com (10.173.161.129) with Microsoft SMTP Server (TLS) id 15.0.929.8 via Frontend Transport; Thu, 24 Apr 2014 11:12:20 +0000 Received: from rio.ap.freescale.net (rio.ap.freescale.net [10.192.242.9]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s3OBCBU7019332; Thu, 24 Apr 2014 04:12:17 -0700 From: Nicolin Chen To: Date: Thu, 24 Apr 2014 19:13:58 +0800 Message-ID: X-Mailer: git-send-email 1.8.4 In-Reply-To: References: X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.246; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009001)(6009001)(428001)(199002)(189002)(50466002)(50226001)(36756003)(85852003)(87286001)(4396001)(48376002)(83072002)(88136002)(46102001)(89996001)(87936001)(77156001)(81542001)(19580405001)(19580395003)(83322001)(44976005)(80976001)(6806004)(62966002)(47776003)(20776003)(80022001)(50986999)(76176999)(77096999)(76482001)(86362001)(81342001)(79102001)(31966008)(99396002)(92726001)(93916002)(74502001)(74662001)(92566001)(77982001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR03MB032; H:az84smr01.freescale.net; FPR:DC6DDB58.2ED64C13.49D7A7AA.48EEF241.20189; MLV:sfv; PTR:gate-az5.freescale.com; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Forefront-PRVS: 01917B1794 Received-SPF: None (: freescale.com does not designate permitted sender hosts) X-OriginatorOrg: freescale.com Cc: moinejf@free.fr, alsa-devel@alsa-project.org, kuninori.morimoto.gx@renesas.com, tiwai@suse.de, lgirdwood@gmail.com, jsarha@ti.com Subject: [alsa-devel] [PATCH 1/3] ASoC: simple-card: Drop node->name checking 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The current simple-card driver limits the DT node name to "sound". Any of other names is forbidden while actually we should allow DT to pass other node names. And if this function is being called, the node must already have the compatible "simple-audio-card" in DTB. So there should be no need to check the name here. Signed-off-by: Nicolin Chen --- sound/soc/generic/simple-card.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 3f2e580..383a4a1 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -156,8 +156,7 @@ static int simple_card_dai_link_of(struct device_node *node, char *prefix = ""; int ret; - if (!strcmp("sound", node->name)) - prefix = "simple-audio-card,"; + prefix = "simple-audio-card,"; daifmt = snd_soc_of_parse_daifmt(node, prefix, &bitclkmaster, &framemaster);