From patchwork Tue May 31 09:11:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9143939 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 B6A3860777 for ; Tue, 31 May 2016 09:11:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9A3B27B89 for ; Tue, 31 May 2016 09:11:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9D8AD28185; Tue, 31 May 2016 09:11:13 +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 73C7427B89 for ; Tue, 31 May 2016 09:11:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756118AbcEaJLM (ORCPT ); Tue, 31 May 2016 05:11:12 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:35501 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756909AbcEaJLK (ORCPT ); Tue, 31 May 2016 05:11:10 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie3.idc.renesas.com with ESMTP; 31 May 2016 18:11:08 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 9703853518; Tue, 31 May 2016 18:11:08 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 96F772806E; Tue, 31 May 2016 18:11:08 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 90DEB2806D; Tue, 31 May 2016 18:11:08 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id UAA14257; Tue, 31 May 2016 18:11:08 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="211981097" Received: from mail-sg2apc01lp0241.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.241]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 31 May 2016 18:11:07 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=9NxTY1lFMRwcrzENpR1+eLpVeRyjAcDnRrzxNAKhPOM=; b=bfZgq8tFBbnbqXMEO4JweXb46MX82tlTLq0WhL1QkFH3Qn5ewwnH3JR9fGtr1luUWTA67lsC8NrFQzKMxwwDsGCQC7XU97ngF/6rvEhF7qeyq1SS9KhP68GfMeR4MCxZeZx/yXVXCe0BIk2PYBKnhEqWjZWs0lPEaQ1MQ6Pp0Qs= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; kernel.org; dmarc=none action=none header.from=renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by HK2PR06MB1697.apcprd06.prod.outlook.com (10.167.73.11) with Microsoft SMTP Server (TLS) id 15.1.506.9; Tue, 31 May 2016 09:11:05 +0000 Message-ID: <878tyqr42e.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 30/39 v2] ASoC: rsrc-card: use asoc_simple_card_parse_card_name() User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown CC: Linux-ALSA , Liam Girdwood , Simon , In-Reply-To: <87fusysjam.wl%kuninori.morimoto.gx@renesas.com> References: <87fusysjam.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 31 May 2016 09:11:05 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: KAWPR01CA0047.jpnprd01.prod.outlook.com (10.165.48.157) To HK2PR06MB1697.apcprd06.prod.outlook.com (10.167.73.11) X-MS-Office365-Filtering-Correlation-Id: 26d15486-7c4f-44ce-97db-08d389337f45 X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1697; 2:kAhZkz2vx6jspzOdnBiT0c75gVnyvQlBXOWv+bxoQzdjoYfo2QvxQRFiXAdYROPFOMYqs1ovAn+trwfCKudduNKOXRPcIFlpn4nZs+IDhyj3JOFxPZkx63RCqWhPSBV7sSc6ERI1PH0///HK+LoZCql16Z6kR1QvNRr8OHnPQtJrMuYFzsfkchM2icbM2PRo; 3:oGLDT1T16XUjpQH71TpsPO2Awf6s9ddPczu36MWg3OBhZ4BzTNIvXn/qmY+w4oMFMK5217jFzodOY9xqjZ6RvxHCVjVZZz5cCZom934rBi3ALFwFoewsRs2RWjt/h5Hm X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR06MB1697; X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1697; 25:PbTslqgCYRKbxwYe28qdhWdM+Chi8sxGwrvuWtXq2U/UFfCWPFfNneRou1i2QTJ9ll702U6ey9pznbZwrvxHeBARn/ANUhj3cwIJcsipzks0ZHdh7l6z1wdEB4Kbd8lub8ZGgjA+ZdGnd91cXwidCkc6RW9gzY9vl1cVvKj/Yf7Lc9xeY//yhFb+KBYu+DOu26QYsiPtQ0/TSF+a0MyGmoaCtaAvWIBh0yichYyoIRyYckI4ecVxIpNJIhlovVGcgg63u1mAvRJzYYxpXwSrlmv6ozP5DJ9r9IFUOyB1maaEyJdrMGXIDNMnGAfN7ussVWgfj+NkD4tbOuB9zYOEYxIUnMyo3bxLT6kAbERe35pniymJEsbB4eH4pR3lPcqmTBiKHHMqgTG/tXkZyfXNCjjF33BOynxS0EJ3Sx2PPUpbw4uuVS18b6CTliplzw/7u/TQzyA9sYnHID0RDiEZYs+2rRBqahRA1NPiKA3rBOqkTPuanFvoalPATm5YhJZCPwLAk2v2ibCogv/+ERK9aeI1aeLW4CUcspfweZ+nT53BhIlYnbB2ULkVucHb2xtjmXqfVfgD1MEn/gDMI1LMYKxwVLAMzHfvBKOm/hcevlAZ4llGT6oy6anJNsi7VOusYmOZM9ZUu8v3yC2j0l3wxBUDQUQcWYtRXbVpZxSyOKDP0pE8lcT9H66yI+opnqpj39hDdY4PjZ5sk2ku+llz04W9Bk2iqPHfX4Au8rA55Cg= X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1697; 20:Zi50s+hZtlEmVlQ433Kk+IRgiK+KoA+eXuTCp+aNBrUywDyPGj7d1wFO2cJpVHWAA1efvNoqRAeBH8kyV4AuSEdEPpjIX86jzeVrEHUPX2Bsec2ykXaZcwK6PpMUYWKLARWoqVGE9x3jzc4MqCbs8HniCyb07BDwVov59YEHVGkh+sX7Qkiu/0GjiFUZN6urGmicCuSkTchjGaOIzpKXlDkrW+BjJU6Thg7DyIGcdoLX598nUoAUY8yj6xGoQMddtMOPnHHKS4cY2/WaEy0ojwlrF6n8W7wpi5T7qzX9UI6q8moi7jr0HcuPkpnQKgSSoHip/xwZxFeDgEIDkpS6pE5y0PcaBQlsBBC+rgufJ1VpOqHaxF3n1PrsaMot6K2UC5N6g9l2n43ikccSj0+8zzOkCe07WCO+Ycvw0doWwmuAo7P6jOqPw1xfb6xstVZnlO88+XVKwHaqzsGwpv4P3Dhmg4P4Ab+yosXPu0Zd7116JrkpUbb6T+RcXoO9u1Ui; 4:EN4/pd3LMT5NPSFJ60Ovvq8ti1sgJXXKqG3gTjeGFsg/Sj4M6RRFlpIrsnaVNG3SIbSo/825qq6wFKMZn88fcwOEjRdFT9tmvXBpuOvsL4bu1ccNb17osS+NvJPL4oGYme4nfLLD1luW/jsDQe5dBSmsdasL9I/rGeeEA6lyxHA6tmIb+uxjNUXn/N32jZcgIvEZ4VRfEbJw+ooj8V7gLxCumPhJJ9c79vMP125Y+9r0kltRuOLWmLhmPlBkUZIszF530MSodLDBmjp/307L0EvxeIsqvIF87R8i7B0o2JjtwqaBNig/9we/LrEHSbEdeH6kIyntGIS1kVGOEnLSvkJIs8mhiuLNvIvdmaZx2Wa+RRlzRb4PUrs++99nxhb7SfRQ14NfIvz3g04zcz7MUQ== 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)(10201501046)(3002001)(6055026); SRVR:HK2PR06MB1697; BCL:0; PCL:0; RULEID:; SRVR:HK2PR06MB1697; X-Forefront-PRVS: 095972DF2F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(46406003)(50986999)(92566002)(4001350100001)(8676002)(33646002)(81166006)(77096005)(83506001)(19580405001)(86362001)(5004730100002)(6116002)(586003)(3846002)(19580395003)(76176999)(110136002)(5008740100001)(189998001)(50466002)(36756003)(23726003)(54356999)(66066001)(47776003)(4326007)(2906002)(53416004)(42186005)(2950100001)(229853001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR06MB1697; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR06MB1697; 23:CUc9NL8ggyh0FLgkykjZPaLoXxjeyxNSS/LOIcV3N?= =?us-ascii?Q?f+wTlJgyzsZ7boZrJofHsWuV9EokgTGyGDhDiS7l7eJxqjBtY+GyrhN4x6ah?= =?us-ascii?Q?DS5+kf5GWFug6UYM6K5in4LGWMcpZjv6m9D8Wt9GiZRlVGDyIR5JtJbwCQ7h?= =?us-ascii?Q?fvqUAuEQnvH5hdpP+3mpvjEoC0NGs5qRF9pRGYkBeAy1bSIjlrOmcpXuCF7V?= =?us-ascii?Q?hBvha+q3HnJpQVZfk+QDtpz/LT9207A1Uw5ZHRn90afMpc90VC8pAWZDBhk5?= =?us-ascii?Q?U+P9rsqSNhB3dZE+Y/x/N6Z8ahMJmnvzXYQapelpjxV5PmQYuHcH+N6H+hOc?= =?us-ascii?Q?A1AsUogoPLXMODcaaqSjmfFUOZEpuam6VCOrcB/D4++DAgUqo9VH/nYb6OYN?= =?us-ascii?Q?Hagv1jQmzKErWjgaBatEj+r6mHyW6z4CD+zXpg81wPqOjtcvdjPayTjpE90r?= =?us-ascii?Q?ACXRCWP6ZjHbvOA6FQtH9OddGJFdYWiFJaF16eFbS+vF6ebiwurYInOM6e9y?= =?us-ascii?Q?iXX0zCSMHFlPP5ASVoeWI0p8ciEN4mSeMm66sS/bN0xq3Thw/9e9ks5nLCZP?= =?us-ascii?Q?5xSkgRnDUNJO3KjjPF3M1k/yZWIuuHxqoKj3ZQyMKgXl8jOZsjy9yxGdPVL7?= =?us-ascii?Q?bryvUlvz7zBE+dwpqCa6hK/dGL28O74atv6KnIfOBI07a5juOgnAHJLR0/hp?= =?us-ascii?Q?48oyGVhKvYLXIgFIelBI06lkknPjmfoWzclvVCw2l018ubKGEMb/2cnq71DO?= =?us-ascii?Q?8wueAiUg3T6lIk6kxkRlftZhDBaV3bW5auG/JOaepU0Z8r6zTOd1p0aan6Am?= =?us-ascii?Q?we/ehzXnst05Ly4WRYjb9KUgAl4r5wCIpIq4kuCArsZLKuXmCwO4b9j9pbnq?= =?us-ascii?Q?ydz4e1YsZ4WaD/eTtCwnBOQ0D/HHJXSvN/A3V/KcJ5ZJDK4MAOvdPV2DFHcu?= =?us-ascii?Q?zEWqBTgimh0EFf6OdO0F2VKOvUtuZaZ0v3QA+RYhg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1697; 5:WDYRZ0nZfzinKMFvvlONResxkr0jE9Oqe6N9JxzBG/myg2fox5TF49mqJujaHGH7IegHaoEwLmcFpLTVagEK18gLQTW5j4vLvAcDIb3XcYq9kk3JsQPfWZPAJMSc74SafAUBUHZ7kBZ+kMwUCicCjA==; 24:SmxiEG0kzD6gjPz2NKE2gTsh3pns/k0shoUwPa2SZFv9/0AnaRH+DZHs0WOeusiWb8gDi+Q+Rwh0TqX8f3SXW1/cEq6BLIPsg4yBw442WQ0=; 7:96dTYAia7oK4RaRngJ2HlqE5q2TUvrtBP5ZBiFp8Tb/qAlFe/FabnVRZRpqB+lgftEBn2n5YyIuBH0QmAkshyrxgMhckJFc+Jb6mp/dMDIJw0GvEOa/BgRpksDBVIXCAOh/vgrejznb9nsGenmxmofH5alAoJ7NfsO6EltxY/r8GZuQQm+bcZ6WQbsLVuFck; 20:/d6/31iJvoIgiJFS4t9lfQkq1zRPjivtSfLLCuyUYEPb0tw9L/ArzEf/NTpVgqLLzlyCiE2nPt0HVPQE1gLFDU8crQThOyZMMTLvrhWldRYxeBz/s00lo0dwjHzXScMy3YtI0ERvAEqpJ4sp4Cxwseq0S964610VnJw44XrUck0= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2016 09:11:05.6757 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR06MB1697 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/sh/rcar/rsrc-card.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index 87b9d87..3aef7b7 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -334,9 +334,6 @@ static int rsrc_card_parse_of(struct device_node *node, "audio-routing"); } - /* Parse the card name from DT */ - snd_soc_of_parse_card_name(&priv->snd_card, "card-name"); - /* sampling rate convert */ of_property_read_u32(node, "convert-rate", &priv->convert_rate); @@ -352,8 +349,9 @@ static int rsrc_card_parse_of(struct device_node *node, if (ret < 0) 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, "card-"); + if (ret < 0) + return ret; return 0; }