From patchwork Wed Jul 6 01:11:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9215317 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 A57DA60572 for ; Wed, 6 Jul 2016 01:12:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93D922853D for ; Wed, 6 Jul 2016 01:12:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8882328549; Wed, 6 Jul 2016 01:12:02 +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 0BE842853D for ; Wed, 6 Jul 2016 01:12:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751252AbcGFBL4 (ORCPT ); Tue, 5 Jul 2016 21:11:56 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:10689 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752226AbcGFBLt (ORCPT ); Tue, 5 Jul 2016 21:11:49 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 06 Jul 2016 10:11:47 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id B77153FB2A; Wed, 6 Jul 2016 10:11:47 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id B74A21806F; Wed, 6 Jul 2016 10:11:47 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id AE5461800A; Wed, 6 Jul 2016 10:11:47 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id LAQ06761; Wed, 6 Jul 2016 10:11:47 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="214478121" Received: from mail-sg2apc01lp0245.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.245]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 06 Jul 2016 10:11:46 +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=nrzifHTOlr8FVwmPJ2dkzhGg5SY2PqkelbAuL8UbFKs=; b=Pjg2HFMThKHGeEfYfE5z/cTOgG8LJP76Nsd95bd8+l9PZnO7m2VarwsVqT7RibCDD+YXyLFhB2EoMIZNA14Of+VCvh4xuL/s8GMisZCAwrz/18VFJ/nWyEOQneEN9tGVv2YWHyjHxgUoAaF5f6geV4iuo8O/LYXRcMaa8w9xeOw= 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 SG2PR06MB1711.apcprd06.prod.outlook.com (10.167.82.141) with Microsoft SMTP Server (TLS) id 15.1.534.14; Wed, 6 Jul 2016 01:11:44 +0000 Message-ID: <87poqrlgq3.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 7/7] 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 , 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:44 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0033.jpnprd01.prod.outlook.com (10.164.162.143) To SG2PR06MB1711.apcprd06.prod.outlook.com (10.167.82.141) X-MS-Office365-Filtering-Correlation-Id: c3e4a18b-b2f0-4706-476c-08d3a53a7f79 X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1711; 2:9SCcuSV45vJlxqPV3iomDruAsXPMje6xYZ426IEuodCXKhgcJ9HjtYPCvKrQuh1Ts+OEpHff1xbebZDvlGhhcabG8J/lEw6WfQV+9N8EBQ90PFUaauhIlN4vSivDMl30ZWHttLKoPFkfMxvbioCdpTm6nylJmZpCbdF8S/OxnvbJurhxtIhxa+3q81T+iMA3; 3:3YjXPaK8ojDFfrnb+NgvxqMdAluK652BpsYRPd6d8Ct/lv4+3d1v1qWYEWtle8SMCQpFX1quTkriV0FwdjN+1gO2mLd7pyqMu2tubaODBmdZQ8mKjqX5w0slcoJUi/lN; 25:GoW2YF+hLiN4bueipELGVNv26mIfdOw7F9YHns82QfISsvH9KVnW+0Yi1c/Vn/xPLShtkzOhUBtL/SG7mphBzM4K112+jd6e4Ok5j3DyNjr09TyNZBWTZhB1h59SA0wUp2YtcF+TuiLeAjen0QE/LNQ0HO1DoR0i03yQWfzHDJVWFmE/400BcmwjFG1g/DYXMN3bWm6ewrSGpFgFwpSUQv3vQi3kK1+9/VUX428tZYbPCike4RSvHwf4sAUIW97NqqMKv7WaHhc5k4GGvd8hkPLUAqOvs1FENwT9ddzpxjOyRLh+X1K01RRl24DJ9R2F7HOUBO+AFuhYujV2UF/3M/9S5TIY3YgmYCuv14qrYN+bMELNOQwArQ+hr7rc4Fp7Pm2GI7X1v8cTFco+JP5W2Q6htcn4OwIKAXZjtU5eW0I=; 31:cXs7epYsFQ55evmYh6M/LivZ8ABRZK3ARi4BQy8aVTcUsUmWs5wEYKNKdlJQ69c0WEugx0dlCsKP9i6QZg81orjzi2TjH3r3y0UJz3GznT3Mek2rtQvCvRQNwHffpPnGvAWOdr6WYZTiJzNzV9vK3e7O3mHVipLwIibid+88CtPqhK4F2kc yIh2vwlzCL7bAwszIBfGdchZQIU7KKZiy 5A== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB1711; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1711; 20:hAj2t0KbbFWNojI2LdD3rvARi0WUkHnXfGpsDm0lqt2uanOKfyAaWVwl2MuLfkBLxFMom7r6b6eX0uBtuNwdqD77qzL6YZj/lfqNoiM6H9riZCNGy9R8XlU5jV7NGza2esX4Hi5rqYDFQ7ENNH2qW/Ldy5sGHDA1iLcP/ev5pLUIxLe26X/AHKOPiI4+D6ZRldwNQwaWFXAc38p6JPKTrVf2a3E+IKIVZCXNusDXaIh8gcDvsTNBPhdxSCFEJ+b21eYt5CAMMVjMrf9kFQxRGyZxtiSv7SbaAsEBDw6scWNCWtGFTHrs80FuLTH7eGSKWD9TFlkLP7Hmd7UPZm+yS/wDETyXzJnICM4LyX5v5c2MRt5QMA6cRKXejG9vGNKDnHi2meAw4LPgF1NOXx1PA3ZaXesdrxIXAEkRhvWsWx3dywaJQKaTGzSW4KalR2OI8m9JUb+0hzWPGrflt3d29q+05YqVRZVdjMeLQv42gKFZ9nMK88SWS36N4qL32+cC; 4:LuG+8z0qcKqBxLViPtEgKeCNTi1pA1ouVekBMhkMCaS3sBR3bfhvQs2TFqDlZfmQ5C7yV+RUhrS5z1jinX8iuP1VkmJp4I/JGyO5JLLXBLZSzS+WwTH5tG7fo9CRquHo5JzVCFCurt2Ecv9t9NIIi/PVajaVG5KLz93vINczWY1WWpks+b7ev9n0fNHHyXctaR4k60JreLvjFWBF+AFGiR7gEfjcEI2MlqqFUcEc8cPUWY2OeEKIf6PPhR6QE7V6XY5WoUblwYpaNq/ORPrPDH7nBeqH6efV3dFT3/Y3kQT2i42HaHRwFwF6XHM+qbPLmfPM0hMwSB96KPQ/cyEVLumoj2rYOsOdE+ZxnCVLFJ3A4c0HAdqYKcA9rX8eC5vT3QWXD/7mYl7TKeauWElL8A== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6055026); SRVR:SG2PR06MB1711; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB1711; X-Forefront-PRVS: 0995196AA2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(4326007)(105586002)(305945005)(7736002)(2906002)(33646002)(7846002)(189998001)(68736007)(92566002)(229853001)(23726003)(50466002)(86362001)(19580405001)(83506001)(77096005)(46406003)(19580395003)(69596002)(3846002)(6116002)(76176999)(50986999)(54356999)(106356001)(586003)(47776003)(66066001)(4001350100001)(53416004)(42186005)(81166006)(81156014)(2950100001)(8676002)(101416001)(97736004)(5001770100001)(36756003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB1711; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR06MB1711; 23:VL9y/9zNo5jkCZrJOtKUV8XlgfaqAYlAO6k7hqtec?= =?us-ascii?Q?L/0NbtbVCwFS/tZjUy1/Q/JaGj0zqgZJFt6D1ujy9wSzhuSaXkKvsrlnJAzO?= =?us-ascii?Q?rf/xMo+oxCNsANB1gKm/vw8RYN0dQdBdAMFfeXGl7bOCvVoWiNIjxVYbygnA?= =?us-ascii?Q?yjMBq+rRcQz5A7aRFTyQZd0yx088FmAl8u+BGJnbsUf3fR5V4x1z85eZU020?= =?us-ascii?Q?wpLBZ/gCSjyfAQjVqc4bGPx8e8LNwbxLurl9QE1DlFSVQWNlSfd7onlyCyEw?= =?us-ascii?Q?TT0Ezo2vXoGPYIP6xfKVQRy3YGXlyN9xTmSUTGipd0yVDQJhKRVHAov0DRuc?= =?us-ascii?Q?cDAa146U+50UPjwq8sMkDClwAgL8HkjQ4azXgbn44AdnehzmmlwPvBHNjdYy?= =?us-ascii?Q?Ev7qJxMDeXvdo11m3603ZD4mY1FS/OLoYAfsJPlotQBVpZBZI0iSAlECwhCg?= =?us-ascii?Q?QeWBxrEuAED7GLLqlqCnjiNSwNeD0Yjx1jjXpMJxCsFezUn+s4ClUpRXzU2u?= =?us-ascii?Q?qdB2l5vbLCIlECcGHEDG+NgD3E4bZN2AorBTNVHPs3Tw2CQtzWIoo+yfX8zr?= =?us-ascii?Q?iqjtMr9WtvoAyOr5IkKex7ib3hpIPwA1QuHuon0spMIu7u+5NIxrpO0LUv5n?= =?us-ascii?Q?9AlnZ+YIx2q33C4TsRyrgUCaVKl9XYW8+7JuO02tKKL6esABM7Wvr7ndjEHb?= =?us-ascii?Q?z9FgCmyKKJGap/4ywdkF82ZTQjSo+ptgWVe04KKoHw3hDhv7OiZglUouD1Dn?= =?us-ascii?Q?IBQ6jD6IgKzqxFA6EypKBEpIREjY6A1y71wWyH+bSNFVC5AfDLhwdW+SEYJ/?= =?us-ascii?Q?ncLXGSBa4htrGfbTF+sGIOzfs/Yo9t/z+hJPC1+hXpv7ZI5veh8vS7LC1/sV?= =?us-ascii?Q?b+hRRGZSiNyz4MZNh/lI60aMiG7Mk7suebHuUgnu8mtSZlYNzzFSLQtur6Bk?= =?us-ascii?Q?OroloY2WjNSbQt7fI5J2dEMrBj9J9jiN/Vmei/Z3j/Saf40geCnwUfuaS0f2?= =?us-ascii?Q?uLu5bveeAk50w/SgmeQ8fng7+imuJYMI1fupn2SYC/svrbuF9b+n2FhY0hiZ?= =?us-ascii?Q?bRII0C1AMAGaFL1XwQFT1Oz/ipJjgvfYMZhSkd1SCnkkDEFjt3VV1DYS5g5u?= =?us-ascii?Q?VymXchg35P/ritmxJBpLzcFJv1hJm4Rq6k+RGgDihLiqGHp2skAIw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1711; 6:RFSiAIC7xGYMvKng35hj4WcVxi0LE3bYJnr3jLSzdOnov4/HT5sk6A6T/L059kOTRnOMKYUUYP7mCaY4M3wCm4xVY2Fa8OuQA4k4b7//LSZT0nLjKJOFtjbugslB6XzvubUc0Brwxyrk/O0d3GWcsp/GleZ8D2PXxOJXcyGeQkUQsvWzHCceoSNhPpeQJxvlxuXzQxlXhp1fHAAkCboVJcTcuBFtxPnw1XYDxf0F5AVhKvIujXq8U4JFE/LBXI5ioDNdp6aOpXPJdVn1gDDg3ZQq2o9wog9T19K7/NTmNHCVT/21juT+ZPgqyi+Xn8UDlTnMuJ4XpQDIxAb7b1lgYg==; 5:fMZOsAYibd2XYjGwG4Xpz9xTDZwERa4F+/9UcaZu9tuEkBePcmazOqK7sJizYQyNAF2oVPTdIdDpoYom5ejaYfMb828jPYd1chY3ziWI7xrVymHIh4kv/jfq9SjSkzKf8Ah6JvBCEbgfK2S0MHshpA==; 24:OAFKziOv+m1XXDqOkkkAX+6Wf08WGlvqdfF/C85iAlup3jsDIQDhtCd6no7dgZguVmMgLn0iZYAHBZVOgkqVDcuQD3Gc0bYzI+gVIuypMtg=; 7:k6i3DumIxRAZqxNtag/0ciuYgiDh4kzoDElAYmFpFqPyluu27OWtvb+4aWum+CNlqKc7IAF4OBvAoAWF8oU/Dt/LQe+m5lErASgXKC//kM8Qai5kjOxgcGEjOzVMY1yZqaC4Tq+4pixnjoMlV+yUqgPZ6sqSxubPP2Zr6k0+7Mmxf1Z9Np3XSvvvthQbT8451LcVkkkHdc3XLiF1WT0N6ouZt2X0hh3cHHyI5dnI/S8FBRid3kohWVtqCQCm9TdA SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1711; 20:TH0C92QORJcfDslyqnVnmYhUT+BHTScZzY9PiyiBFdSMxGJ6keLB/7HpR2p+K1RKp8Am9muyS0c/GUkGHJOzyh6q1MnT+2e86VldnY6AbeKESGpMSFd5DVYi7jgu1Cbkp+K9cvIxrOfKbhB00J486kRVgs+5744lVVxzdcu9IVw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jul 2016 01:11:44.8988 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB1711 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 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; }