From patchwork Wed Jul 6 01:11:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9215313 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6C28060572 for ; Wed, 6 Jul 2016 01:11:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A7E82853D for ; Wed, 6 Jul 2016 01:11:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4DDFE28549; Wed, 6 Jul 2016 01:11:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE7BB2853D for ; Wed, 6 Jul 2016 01:11:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752097AbcGFBLP (ORCPT ); Tue, 5 Jul 2016 21:11:15 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:39202 "EHLO relmlie4.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752063AbcGFBLO (ORCPT ); Tue, 5 Jul 2016 21:11:14 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie4.idc.renesas.com with ESMTP; 06 Jul 2016 10:11:12 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 05C7D46570; Wed, 6 Jul 2016 10:11:13 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 0510E1806F; Wed, 6 Jul 2016 10:11:12 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id F25E01800A; Wed, 6 Jul 2016 10:11:12 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id LAB06681; Wed, 6 Jul 2016 10:11:12 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="214478085" Received: from mail-sg2apc01lp0242.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.242]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 06 Jul 2016 10:11:11 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=5Evb+qmelhm7h132t2TTl9MfM0t4sst4gv97UqYJ11A=; b=nNmFx1ZdQ/Ca1TrYaDzNnKR+w6kpD877aIYErB99o/0TSliYZ0RFthP3za4ULBIuL87nsMOoY58Mn041snjcYEmr5dknWdpA+xriCzGsryaHM9XS0QHMmEk7cl30qP19NI7WXVtjXIptcotTNs1RU81J25FGWD91ngRy362U7hk= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by PS1PR06MB1705.apcprd06.prod.outlook.com (10.167.53.15) with Microsoft SMTP Server (TLS) id 15.1.534.14; Wed, 6 Jul 2016 01:11:09 +0000 Message-ID: <87r3b7lgqm.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 6/7] ASoC: simple-card: use asoc_simple_card_parse_card_name() User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown , Liam Girdwood CC: Linux-ALSA , Simon , In-Reply-To: <87zipvlgyf.wl%kuninori.morimoto.gx@renesas.com> References: <87zipvlgyf.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Wed, 6 Jul 2016 01:11:09 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0033.jpnprd01.prod.outlook.com (10.164.162.143) To PS1PR06MB1705.apcprd06.prod.outlook.com (10.167.53.15) X-MS-Office365-Filtering-Correlation-Id: 627c00cb-d192-4498-d9a6-08d3a53a6a3d X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 2:Zba9w7iutY/CAv55Q1jmZXmKtkk+CR20r9+gIvDNbRt7Qk5RfWVQiM6umMRlqaYlYJmytZna7iygYYifFKyzrKHx05W0UnFCa2Q/w9Vnqc81sS6emyvRw1RQj31nzu6wm5QAcaPaBf7BKs7OwPvFsX6gImgdzyJiH+fyB/WQARU4wrEtmBU88s1KMSYDk205; 3:UHx0kR+1KWlR+xTwNH8g75zakFqbuKhnrRo1lnZjLFENPispQHt82t7w818Z9HemQjoeqWfUyvpERqvqBH0Cic/XerKVZmoU3CN3Z6WkyDuFDhdNQrY+X54nLrSO+PfP; 25:ebf6Nw+gXwzs1+21j/0MjqMAzSkpOWaSDPTi9bLwEXnj/4x38vy+KJ0HJmpr0ZbH5QX7ejMz5FuirXeKZLyOoGvkhjx+GtMLsL4RdMm956iNnbpLwPI0J3z/8FKl+j+Og20BpKLFYoxQg8MgoqeYhNiGDeLJwx4f+mcu+53Dxi4musjl6VmE3K1DXjOrXCHMCz8dNvRNi6QAw6R/uiEuXnyp2Ge9ywa9V2pWVesm8CXIkMiM0DlE/V8RnvWNnkURy3GtfonGo9BWSDfmECQfoopgtv1Hnt8vWQsrcYaUNg+YjYVufRpidbuX2LRvUJD0h5cpM55QiiekSvgHAWT/znlOuCOGCRlDx1n4VQgEda1Hdls2zrTKsAOWHuZcjzQvRzc14S1i7d0B/O5P0ngbmBejEtsFi5Yr6SnYA3Szau0=; 31:fEdsliy+hlMhasoy0q0ST05RwD5m3WuYMbkr+TXzM0GgJepe7BtduIplqbjynqvAFuyOgPN0tsUPbz84xveoMxd5dMkC1Oatucl1Abc2etzH/+U62Ea4qOSf5UkgukLCknrS2UnXY5dmx/49z4+lwlRbvFb9DjIGhlQ32gufUQWgy3SlsRY XmHFd7429dJshT/y3LJwZW4rZPSoJKP7U Hg== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR06MB1705; X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 20:Ekzv3oAsp4NmzrjGpMLUj046FkoDqdzvYRh4ai8lSYVScy1mRHdqdkD0WLLhTYLW4V78dawthL8K7SDPIlI/OxkpAFBQqADsnP0qUkqHBgWrIzFc1lB7mJqqcPuGmYnQJWSA0tdz1zCZC+e8IJN2VLZsILCl6HeMZ45dYKEtezjV3suDJ1wa9pWvnSCEL5z1g9WC+MyJqj9Prd2dH6xD38s/wrVyv6JmaCaxJ9Ms1OwHIq/TilgoWcrMFOWb3evaoU9LzSSwcFzZewyiXG016d3v4hbb0sWQK8ag07DqChk07wbTaB+WDfMZtX7ftn5LuEgIX0tQCKaBQ0oPnkJHjVfZ/jEQecDPC79qWOUx1y+LoD8fBCnfWfc8HVpjfLciSH9DCYjPVS7wA93PLFYd8AeJ/Owqi3d72GpWPOeywXbaEUslHCQ6MRo02Grq3+2Vh1WYmSqKUi6neVcIEl3jKT/39a8CrWi0tRmlMyCnyWu7HPkv9zqC1wGJUuIsXT2j; 4:i87fBAHFAFtlue7PY0CyrlP0yihIGCLae8Kerp6zDmfDYFwkALN5EMmEMs626GdJ9MZpfw0CPqcE6OtzM0L1K1CjIAjp7Dyd0YGwbDa31OsN/EhhpNboRLoJ/Xzy+cxQPLRi0w3vFi3nEPks2N9RZGCTRV7HWLY6Pd4Y0xQF2mZVBpLIUFCslFGVAnCxbE4SyPjyZVXdrrbrVIeraRv2cZvrOJ69fx1+g25S2hSnWosiRQK5D2Izs7JuScUJmSTjaj0CD2WX1VkrlCcEa0dOYws4OBpVDefr5tEaVrUq0Nwi6K7GVXOnGZ8rPpwyoNJsoBRO1No5EgOiOlx4Wg+ousIPv6XIlYtAQG1xJ4NgBe4WtPP9t8P0uM3kmXWTkENu3ozhduxNQGE2Su6QG/avpA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:PS1PR06MB1705; BCL:0; PCL:0; RULEID:; SRVR:PS1PR06MB1705; X-Forefront-PRVS: 0995196AA2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(53416004)(4001350100001)(2950100001)(42186005)(81166006)(81156014)(66066001)(106356001)(54356999)(47776003)(586003)(97736004)(101416001)(8676002)(5001770100001)(36756003)(189998001)(7846002)(33646002)(92566002)(68736007)(229853001)(4326007)(7736002)(2906002)(305945005)(105586002)(46406003)(83506001)(77096005)(69596002)(3846002)(6116002)(19580395003)(76176999)(50986999)(50466002)(23726003)(19580405001)(86362001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR06MB1705; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR06MB1705; 23:onGIA31Kp4R2U/J1X8ThKC8kQaEimwcZE0ftqVmOn?= =?us-ascii?Q?aGpKVkPzbWdkLphTt8Msz+MB1PzvOyBr+/gpI4DyENHbIC2Jkl7UfslcKpYa?= =?us-ascii?Q?1ob2714x8ntDRy1H3Ztwe/MRlDerpsUBgM4NBjYsBeN6DGIzS0fOoM+0WgjX?= =?us-ascii?Q?1QaKG+h3oBH47LRP2hIAqWnXrZCDFy5so3OltHiv1fDP6ZlEZGFbLiLnOekR?= =?us-ascii?Q?dz7FwGcTEr7BNyjRcEJb43ZLXrJdsWEfCgvfud8AoD5p+3nxXDvZoj8KP5Xy?= =?us-ascii?Q?7qPBgjGTrzO7Dvj7d/V/Yc6W4pfc/TTiNV/gGoBb/1lxvyUYdO704qUk72oE?= =?us-ascii?Q?6HN3pgbr/sOVn5jbu/GBDB6aj6DKiuyb3cDt6x8XcnU1JlFTAhrVHZhTpvWA?= =?us-ascii?Q?MGpkKjZYSQ0yHkt+S+zq9m87Ji7GqOluepIlvf3cVPsJ2hSIvZsGlxn72Y3t?= =?us-ascii?Q?aIUu59QuAZ0tO8Zzr6lRO5gwpE+PEI6sD7N+JMGZfwywa7s0IwuY0MgZVU3s?= =?us-ascii?Q?OFLJMWrC/S9YdROrJsJ28VWDzeYM/6gsCZb/Vd+AskLDSlXK+nbBZQ5l2/fe?= =?us-ascii?Q?dCMiYT43l8W+sSc0/b1c2nBT/viggHLA89YcSK5bmeKFtd5L6lzvixB1zW+c?= =?us-ascii?Q?krXVV9E/EpLNBQ8yC8DVOLhsO/qZUY/BAPExz26BWur1rbmYet/ncOyTC5TQ?= =?us-ascii?Q?SpRE1xfh6vDvF0sP+ZJpceYwBhXHZfBKqeS5Xf7A8p1UI6vYvYmI0nbS/jne?= =?us-ascii?Q?stHuejPlULM7tD4H0aqIkb3WVaPsTC93CqYqsy2K0dd+OxcCYGQdS7N45FI9?= =?us-ascii?Q?V5CXqF52mxC7Bws63aoqAG2oMwb4IDjqw/nsgALaui4Ej3i4NVzVExUg6DN8?= =?us-ascii?Q?VybDDOGGwwGk03qxcHb453YXBqmOBdxmQ8Q1i/eUwoB0RuYjt8wB3K0n2EyO?= =?us-ascii?Q?CZp7RQmwXqSYzUlK6EDgDHNHAEgj1kCPrmuQEgl6BimEJmKhbVVeGsd0g2NT?= =?us-ascii?Q?SGixvPMI/bDHNs9b3YQD2YQTKtynn6WjvsS0fz+CbGXb7b6pYmfK7mbcJIdx?= =?us-ascii?Q?yl1m+BndC3gsSZTY/qx+O6hsNMF6Mp0NfSKLkDnYor3x24cOJkuJg31QIPvF?= =?us-ascii?Q?wko+vWZUnMeFXp44MrwS7WsA/qcX5MYF+uHAdPoN5tinknYXqmbDA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 6:POaEZJkhzdVoC0SJ/nfR8v+ISrDudTTGse1uS0AeDljnoleY8bnxbs5xiA2n2BpqBLGcJQDWAarIe4HN/nAKeLZk/7FR42WeoP8ODmtlRaRnL2O0KFg3ZDV88t6nlGvo+ol5VbfPvxeKiqNZivFifbVoQ/xeUADq7ANLQEaGUVFhzPPKrkTjCHowh41WVNjxJaXdP9p/NvQMynQNWS4FGxePgj9B0Dmwonxks9DeHkWsAVo44PF0wz79tcLvAxIZ76jri2csgCwBsU7P0kh+annfzNLlud3gbQQJr+1lfUwqP7Y+CEV8O0JRW7s+pznD6cySG43aQ116fLBTOWaEWw==; 5:wEw9+a34iV+e1/q5zmWkf2Vrsmt9glVlNrsJWmldOuTyCqor527F/ikPSif7i3hrypD/hzhltspzJk7lCoFmR6W6njPjeg4lYvblanja2FruXlyfed+Tx5N3WQBkzwOb6LtysGhBJj8GvGGLddqujQ==; 24:jfHFVrA8Dh9ekFPh0FBdUNGRIVWRC/3Wp9BHaaE/USoPYTpBDDBLz6C/nTWnFFT7mooppYsI0//wwvJVZ8D3u9jwgbkVET+8aFq+ma98Al8=; 7:j/ikWf3AjfdyA2eGoX/u6MX4wx/WIz90CWzo3KdTEOSLFhS41nsxmlIaNMt91Yl2SIbiPFGvyEtCLNiGU3mT2CEbd2OandkbrJN9P/w5qtfxi1yxx2nJOlqLZQ3lSq7Dh/HHDoakeeYmwapJZbtNLB2CFbXj6fqbJb74tOAbcDrCFULpYDO84yhOGHy31Rk62U7IoxYGsXAmLp7CCwvswGUe5uiNQZwylagg2RK3l8NMPQN4zPJI4mjugyQ43Mu8 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 20:2XK3WMxLCgH1Qpb+13qrEJHJIIGmtBwtbz7p6BOTOBzciQSEv0x9ClGNY9mXC0dbGobZ7nA/Hbgd+JeRZ3hLYYNue48g8MqfdGJ0Knmk0GrEopWsAHx8rj5adUwWuIGLxJNstayaZcbrEfr9i7w5UZ2gAz2ci4jksavROFaHfdA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2016 01:11:09.4913 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR06MB1705 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto Signed-off-by: Kuninori Morimoto --- sound/soc/generic/simple-card.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 07469cd..43295f0 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -427,9 +427,6 @@ static int asoc_simple_card_parse_of(struct device_node *node, if (!node) return -EINVAL; - /* Parse the card name from DT */ - snd_soc_of_parse_card_name(&priv->snd_card, PREFIX "name"); - /* The off-codec widgets */ if (of_property_read_bool(node, PREFIX "widgets")) { ret = snd_soc_of_parse_audio_simple_widgets(&priv->snd_card, @@ -451,9 +448,6 @@ static int asoc_simple_card_parse_of(struct device_node *node, if (ret == 0) priv->mclk_fs = val; - dev_dbg(dev, "New simple-card: %s\n", priv->snd_card.name ? - priv->snd_card.name : ""); - /* Single/Muti DAI link(s) & New style of DT node */ if (of_get_child_by_name(node, PREFIX "dai-link")) { struct device_node *np = NULL; @@ -476,8 +470,9 @@ static int asoc_simple_card_parse_of(struct device_node *node, return ret; } - if (!priv->snd_card.name) - priv->snd_card.name = priv->snd_card.dai_link->name; + ret = asoc_simple_card_parse_card_name(&priv->snd_card, PREFIX); + if (ret) + return ret; return 0; }