From patchwork Tue Jul 12 00:00:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9224421 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 D98FF60890 for ; Tue, 12 Jul 2016 00:00:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB7CE27F7A for ; Tue, 12 Jul 2016 00:00:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C059227F80; Tue, 12 Jul 2016 00:00:10 +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 3C5BB27F7F for ; Tue, 12 Jul 2016 00:00:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752815AbcGLAAH (ORCPT ); Mon, 11 Jul 2016 20:00:07 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:32573 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752695AbcGLAAF (ORCPT ); Mon, 11 Jul 2016 20:00:05 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie1.idc.renesas.com with ESMTP; 12 Jul 2016 09:00:03 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 8B0923E399; Tue, 12 Jul 2016 09:00:03 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 6438918070; Tue, 12 Jul 2016 09:00:03 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 638D41806F; Tue, 12 Jul 2016 09:00:03 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id JBD22204; Tue, 12 Jul 2016 09:00:03 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="215358853" Received: from mail-pu1apc01lp0019.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.19]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 12 Jul 2016 09:00:02 +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=qmrSuMguHdsDkLPbQVFZcnYOCBK7oIkdyhSXWvWaMVQ=; b=NS32z79WAPrfxZbJU2jRtDKgBxv81SGOufUtR3QhlbLC8JYLx7VgLTZphN9b+9Y1KKCMOHL6jJGKh5SXzj6Sw5oBdlqE9YnNX/r2H8db9Qwc79mxPPnwHqDyaOxcRQ0kbpvtCUjQ8d1z8t/aAMdPUaEldS4SeteVwP7aKCPdFhQ= 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 SG2PR0601MB1456.apcprd06.prod.outlook.com (10.169.106.22) with Microsoft SMTP Server (TLS) id 15.1.534.14; Tue, 12 Jul 2016 00:00:00 +0000 Message-ID: <8760sbn35g.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 7/7 v2] ASoC: rsrc-card: use asoc_simple_card_parse_card_name() User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") To: Mark Brown CC: Linux-ALSA , Liam Girdwood , Simon , In-Reply-To: <87furfn3bj.wl%kuninori.morimoto.gx@renesas.com> References: <87furfn3bj.wl%kuninori.morimoto.gx@renesas.com> Date: Tue, 12 Jul 2016 00:00:00 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR0201CA0033.apcprd02.prod.outlook.com (10.164.90.171) To SG2PR0601MB1456.apcprd06.prod.outlook.com (10.169.106.22) X-MS-Office365-Filtering-Correlation-Id: b61a2ad7-9cfc-41c7-4803-08d3a9e77894 X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 2:+n8embntUimJNuUd2yKdc6F9FZJyOrut9Pa0ZKtOC+hg1s2LWWgl+C7qRL/TWX6zoeOL+IfNAYKJabYCfm25kO10iwS/q6b8FFhlr3/VthftHbZW6vSQwzEwlwzwpChDALydS41DowSB+xEz/2ZatMl0z7jm5OHujj5oofIwNFKx6gR8J35UogcUIVLzgeAi; 3:FXkocRZe6WfX4+y2BCpT7v2eaW14ZYOf+dxepo514tZ8a+sBQpAaZA622aQO8djRdVv717W3fEMlaEXqB0i7KPyub9uto4iEkYJaow7kB6EhOG2h/Sien/g6Pcfr3KvW X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1456; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 25:I7BlwygIi3FKoLV/j578ycd5PoZEUp7KlIzyz8v5KZo+yD04PaG/wL37QBVG0U/NxfI0n7aCnsW/deQbBVAbP3bXHpdHyormhDYvs2Ll7hyYLYolZGoc8+8xKFKc5kajS91k+02dnA2QsMtcmBL6+BXWiqEA+VirtE9S7vMmPd4fjdjZa9uJ5bPEMaw6kwJb+fpBdViIwMKQO8U91PxlPhxysi6BgTsgyB+oHbH9z3Ym9AcpjaiSvrZPg7xPlhfWcPvvaXNGXBGn2nr1W0FTtwkWwER4UySiZUlklNJ+qEU8My9+NUhSZjLAe9y2oCVFP3wRRyac2mLf4SLI+L/254cT3O4Qpxa/ZmMmTpy3tiRKVTz8x+QDS3g7ll219TE0TcJ6TSuqFikrQV+8iXs4OOn25r03S/Iww7b3ERRvy7RGWxpXRKNT6aKdg+AdwYYCxfMI3SHXitxkotuxOL1bkYhIqXwJwSHZ1f3GclwgiNTH1wf/XJB1LPPh/T0qiKiUWGoPEiQA466xtJVf71IqCJ99BcaeEaMHHgvtXCW4GJbyKPd+rSPRuwQhF5bqQzkj1iNkWYa0Gzzs9nYJHAvVIAnQ6luCJlLW2y7CYp9wigMvxymxZrSBJq8L3Cs9iGWfRjqTdPUU7CvMs1jFICjp+XZYzdRHiiLG9YkXFaWHIEYhXTEQAWUbDoqllO4XearcQftXTodd4d7Hq6PnqJwy9A8FiS30YLEMn6bDxQgsuCA=; 31:dOJN93I4hQNTdz5Xvr8WIofiIjr5CFoDZLp90LH+jw4K8xZ8OuVfmbhMu9vO1Jbv9IE3vetSfJ3itNqZ4GP6eTCtSotCqFMjqlz/ya+T7vl+2wGEuz84VuAzCMMxW9OnZD6S6OXkgcb4zCNT4BTiLQg3LYviWy9wgwjUl2hwiPosb/BWd/VSWns P/KJ59EE86EYiAQmbjrRvokBKwxPaCg== X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 20:EDIqKF8kzvHqWILU+8nt6NPZM3w3oHbjzxfrMGFqVIiv4Gv2PrsDidN0Vi7NTilhcCnWHXxfN2VB7gmiEHiqJOyQx35d0aJEYveNZuWwKGf9+UmpVrW+MAZOVGt9640UjJj14tMQfgdWEctgxIcJhXsUgQXNKLBkZWRDYJY/tZrnrhfAuS2pIVGqNn0oOOmsmAbDsZvqPUlj+OYKqTD5HXarVT2J5l7wKPHxy6WSFeplIC/uPnYqd4eXDWfncHFrqb4DRKfXdxvBgEN4zwIzSIITSgx8WdTfiRo/xxuQSDZiilbEOAxFOkC4cmxxV+uwQKLxpQDmCwiopgk9QtIAYrgr0EkRkH9pGxabwLF9F4fs06sZaR5/HXxaXbTxR4c8ThoPcCdHhm5DW89rTY5jABXy9dg2nUaMDiiCI4U9cwFRiRVLuIpEgwSCD3vb8/MYtIM+1vI0B7pTZeRpL4qm4SF+Bg4qC6Ahnvig1phst6ZS7skw04RNhaUsoUcwWpXE; 4:uZfq46jvPeUqbJoGrx7r3lqK/HrKlFDeNkM3pfQJ3lo7FoueP9cOgWupN3jwi5RXv6UtVjQGqHrgp1GMOvU4IC+utG7NlpDqBjOn7RtufmzWuL1M2YO7dYJgp3hWoma3RBuKpiBEZiJtgYiHou8kPkGxwUWpRMoTBgzdhvDtEXjdCc8NwJpHMUaV+b/HHpKDebFavcJlWw3MuoDS4JOvzDTZbWyCL5/1Txku60TVvbpE6uXchs261WgJUPvG0kf1zMMJuWF+/aoQ7mKfTe4StZmiSnfM2inPAXFaz1DWYVEBn9/wNESHS9dFlmdw/GymMyP6tlSo+FEnWmlTZwgxyom+8b5nlrOoUVHZTWBwzDZS5/W+LByXWj0L+Kwzp+GS 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:SG2PR0601MB1456; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1456; X-Forefront-PRVS: 0001227049 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(92566002)(68736007)(47776003)(106356001)(54356999)(76176999)(2906002)(50986999)(19580405001)(8676002)(42186005)(4326007)(105586002)(86362001)(2950100001)(229853001)(586003)(110136002)(53416004)(23726003)(69596002)(101416001)(7846002)(36756003)(66066001)(3846002)(6116002)(19580395003)(46406003)(189998001)(305945005)(50466002)(4001350100001)(97736004)(7736002)(83506001)(33646002)(81166006)(81156014)(77096005)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1456; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1456; 23:GItIgqOYmrk7ZnusqGnXaczVc9IxfNKWzSt6ijT?= =?us-ascii?Q?4Qy+ZvhCM/A2ueL4c/dPLOrogCfNrtqfYOp7r8X4xEzCSt93CW7GuqS9aa51?= =?us-ascii?Q?8zC2zlCt4m7ppJXXWIrCmv4ys9xALoCoxuUVA3FCXULbwU5c9Mij1Rna0FT5?= =?us-ascii?Q?pBh3z5otar2Yml5Xx1YovSV0h5kReOlEt/+FW0+FB6NJfQ8GHRDYS+ZHbDNn?= =?us-ascii?Q?DQ29ws9XCE5PpVrGbri76zfxIobbcM/LDWXFYEUGt61LhYsGJ4ERn3FUN8Ow?= =?us-ascii?Q?XFGExCKOOB6+o2gE+g8Iglwzi6vUNon1lHmZxq/K/N6c1O4Ps9hp7OQfp+gC?= =?us-ascii?Q?iLuWNx+ExRPk7OqEQBIESGgWSeIIDVe9LHHnagyUK72buykyWBjpbZbJRUGN?= =?us-ascii?Q?3jJRg5nvKR+SZ6JSsc5xiSwM/yB19TMadqYFXEqBk5/Lu6qL1timPAWW4eBR?= =?us-ascii?Q?6Q0JtoHzenpaUPrExk865t0OAJnJjR1oV6fzEbdkz8UwAfErREwb6wh5/Y6x?= =?us-ascii?Q?vQ1vqtjzaveKSnhhZiintbF46OBYF1Tsd1q4lv7f7b0cLDs78AqIZuPYJSh4?= =?us-ascii?Q?nwDUI5p0bAkzyGisjmp5cSMu4UdhusBgxCsKEV4kDyubgIVZSFZYX9b7tvFG?= =?us-ascii?Q?P5uanhyywK/C6i39whYgk8pE5lTj2gVU/dhPpjAzV0kE2K4axru0aj+hmzjX?= =?us-ascii?Q?3SxyMjMGEvVnXKwY6vijxyEGt8dclmMYIhiLX6sXwDUtc12n4g98wR+RkQxd?= =?us-ascii?Q?TY1p7DgamanwZnzpYvKEDGmXCKLxHwbPpaZqpi7Cw1SkW8CHsQARk4CFBj0k?= =?us-ascii?Q?CbLvzrZmzQp/3EaXNNjlcONA3Hr2nkESCBr2gjuLsXFp4g3aUlI9Na9MtM96?= =?us-ascii?Q?ELGtSbcMErMPJP1KfdQalsmFDwJzj4BLA+xdupJbDrAOuiBnYw6PdRDYhzat?= =?us-ascii?Q?inkIDsDF7npz3pLInlosqalm+uR44GRNwUxA7j2Bdw/VeNxhA2g+d6nH0ABg?= =?us-ascii?Q?LhSTehQtJ0kWytJ8bgBsriu6H/vqzhUhVgLRgzsWabIC1q+8zzQT0VjvyByl?= =?us-ascii?Q?gOmPabG81hEMPP+9vqygvemV5r1XIuFTYk2QG8Zpqe4BktPb+glfNrOLr8dr?= =?us-ascii?Q?g0iQO9XQBq3zF9bWXonzkSJ8oPYEY7fYVbL4IyhfQOO3nPogN3cz6Iw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 6:RuYBPJelZsWKPluMheoCD6SfVhAXBEw8who5TLSoQTKCbRNUTDyz3B6kcxryD0wiazhnypO0KpJNeolZ5EAbL9jYtXV9Vv1vCzRENDXBzE3NE77v9iJthiV4AIb+I7m94+XrY1Zuua2Xh1jSH0qB9RiLtogdg3pnli0p93Bz6u0GH4A9KNKjL39VBwL779SAmDeXzkDQcXB1SaANvKI52z32DcsGvYF6/jxp9xNJwRYnkd7YQcB01a/eNMJWeiZS8ygTaYU8MOLSlaQpyrFXI+n6ftBR9Qz6eOUVGygKN/KgNCpw27nVFbvvhb8SEGINGRhwf3t9fmhFNGuVY7iNew==; 5:4DMs/0D2+wqrKOa63B9DnLFbP46GJE2/OAlylGPA1YlAcLHQ90uXqSTywvwk7q4E8Y7KUCl0zs+OuRSdDKptieBBrjsbHJieSeczmaGy3c0JUWOtHJf902XFWC4mPeXEd3Hc6OiDlN7DBN8L0XFXYQ==; 24:iZCSONTvHs3hZJvKTcA2KyDZ0vjSisd7vc7/6EJLI6jBEtAu+wiMWV6Json5/1Io+8AJEpyGSPekO/8JBwLDRbIuyOLCqBxIYyOltkvU00Y=; 7:wyBNJiSs5D/6PepxY3Ub4iN5k7SlGNViZbxmZnmTscwyKBJSDrnovvJzCGCy4V3WDYtN0Wd4/Tlt51VwebFkaUTHcR2RFbawiahD5QShZ2tWRk4JLY836/pAiGlrB9VAhvwryPzj7aS1Ivpyb8Bo9PZ5ak+txu0L9PEtFHDnAfG9TY3i8dT6aAjEwLAc0s9C3P0xgt7Ax0RZguUEsIyP9KFDKr5lS/CDGZWDEYnzaA8TSKxvWMDGiHM2HUYp0Fni SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 20:E9ErVMSfV3FJV0LnLZhZU7b9f2da3yIN+PgHHPWyx4dKhg5pR/GAwb9kBTV7hq6EmvU8ejwkq9Y1xznaxcPTrwR1LypSYhUNJ9VcqBumIBJ1HmdiITXx1m99IblKBD2/341TmVakYI2Wx790A2EDr3rsJBZxGTZ9GyEtyO10Y9k= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2016 00:00:00.8970 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1456 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 --- v1 -> v2 - no change 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 239a13a..fa37f84 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -395,9 +395,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); @@ -413,8 +410,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; }