From patchwork Fri May 20 10:02:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9129109 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 AED9D60772 for ; Fri, 20 May 2016 10:03:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1DE8279C4 for ; Fri, 20 May 2016 10:03:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96B9B27BF4; Fri, 20 May 2016 10:03:25 +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 CFC7927BF1 for ; Fri, 20 May 2016 10:03:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755691AbcETKDU (ORCPT ); Fri, 20 May 2016 06:03:20 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:30609 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755567AbcETKDB (ORCPT ); Fri, 20 May 2016 06:03:01 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 20 May 2016 19:02:59 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 751BC52408; Fri, 20 May 2016 19:02:59 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 5DA7F480A4; Fri, 20 May 2016 19:02:59 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 582C0480A3; Fri, 20 May 2016 19:02:59 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id VAU10155; Fri, 20 May 2016 19:02:59 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="211715663" Received: from mail-sg2apc01lp0243.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.243]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 20 May 2016 19:02:58 +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=1/FirhYpfkZuBr0JKqmYGjlM52TXdpsOBTUq6Ipk3Gk=; b=JJR03py5C/1XhKxjG9BnIxCRLP8hb2oOOJOPkNVuIq/piaL/02URDGuEB8DGhTnh9qJpPjBh4j2JjPI8EL0he+eRjXzzv7zBrB3/PNJalVGAN9Lrs+GIH6xnQwzqd0rTqB8Ya/vChHv5HtBwvCRhyGYC8JhWrG4QozdmjP2NokY= 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 PS1PR06MB1708.apcprd06.prod.outlook.com (10.167.53.18) with Microsoft SMTP Server (TLS) id 15.1.501.7; Fri, 20 May 2016 10:02:56 +0000 Message-ID: <871t4xqch0.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 38/49] 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: <87lh35rs8w.wl%kuninori.morimoto.gx@renesas.com> References: <87lh35rs8w.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 20 May 2016 10:02:56 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0112.jpnprd01.prod.outlook.com (10.167.154.30) To PS1PR06MB1708.apcprd06.prod.outlook.com (10.167.53.18) X-MS-Office365-Filtering-Correlation-Id: 86e583fc-2fe6-4af6-8b2b-08d38095eab6 X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1708; 2:19UGxjm2vSgv3NuFYFh/yw+4GYP5KxdDfhwpYZk9WRRqrVbsOErFR43tQjWYWuLgjbGWG1/8OF6GJd4KVL2GkEx0NY+ZbhytbST+XQlYAakgBSe8PglJygV1Ng3HnnBUbNHDm6rbI8ySkRU06PDz16ObaoZSuMv6NiLJ8U60HKHC4YDl5CWvHQIhPFqJxM3r; 3:btn4wRoVdf5vv7DoE2oBTUMKUSOtAWuMe1YgQNuXjMUvfd1Wt5Pi0avv9Dohci5S9pXZGXc8wOzsOvoSNVtMoO4H8eEWhYT27MHpOb2snqJ0K5mo2wTl2d23//5E+Lj5 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR06MB1708; X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1708; 25:Sg45siUsMegfpAOC4k8YcNLPL2sj4BalvcOl5BvRdVgfxtR8TMNS4Audx7WDx1+2I+Qcu0bgXhm3MTn06oPPiTh//LnQM4XgWS3S80Zs2fjyGIEEpe7vzVXB/nAAWyAJF8nU168/dN2YgLKHjLkPQVZrfpmsjb4CIpn/D5ygVWDsnr4Ql0VjfU50nDNgawPkYrjzvAU8R0NlnaenoiF+f+yjbtP0Q8cMZmyazZc5p9oT+Th5SBpYHYvp44Jm2e9xx55mc+wWJZWHvBwtz6cbbXzzRbs1W+vC+cGZPxXSTv0YJofUjatEYMGYp3qR5MHMhHGZmEoROcGfdaoHrdzf5hcVAq364Y1g62MMiababzXCOXuWwTGwpfvaZpH/LSANxuJr4IGjXSeb7HcSGI565ZLgdJmoPlz1ymUiXTyiMKKrQm6sN0TX4dWtX1otLpm9Hzc9Pc1brBdDSEx5OI5wtoc4R+gxkOs4S/w7YRZMpZty3UZuae41kwCaYHi0FrFnlm38qfF3mK0SYKVNYd9jDE+C0Nm7JXMPFfrMaaDsmED/yxDW0p8MaAqF7n3qmQZVCLieQ4aPE7vlDCmoH91gcA47xTOWLzwT5CaGgyGX/MqcCI3o/06F94UcWKHPyGSLT/KNiMCIMiivEUxBbi/pCAu7AlYRLPlJWqvC/bz8nAB/Cghpxn91BbzEyTnj9WV9M+j3oQMaq9WP4VAEJPDFUiouS8nY4CpF5VaY9ETkiT0= X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1708; 20:p6JLNmXoqG5osEN9D9WblyKgLqiW0FAgGppKrhRO+Utv9ZE1KucGBanBMWRaqI7aMw3CI0DQz0WazXm2DEtfgjcN7kT7tArDO/9a/Fz92n5GLwLw/P66/fQjx8ED+ehJjxjoUBL3P6nzneuz8jj0DFQ81SJf2E3KqZkfVeH3l6SptwjSHvSjZCe21g5a6r0u2DmHGS9JpsDPex1o5bUJWBqqtjta4JWWCJ5GQ1tUEABQk1dIJL6xg11WDf5Fkc4V1YxPLMz0zNdMGKfHmOBiwW/HVSdPzckSfd8Zj0Y4AJU8a8pmHXoEhk5Ziue3ZhEltuGPIyPeP3UDY70iR55BvlkDGD3Gl8VVAL23JQaLYusnNBxvtIAwtztwaGOSqtklMhrVtTjmrPcAOGLMDw6Y3HKFNN0YXI3Vn2b+jEPm5Xdny/gKvZN8CUo8NbCj0BwfzQAru37SoiLRZwbnU6tMwZrxlflvWrEHSt1fnHUdHry6ZuNSteYlIvtIo6ngElsP; 4:APFJGW0CPjqSsqP0klstPnFYowXMmvKKxC33L+2UXDTSbeXYzgVaBByZWyUAhLOSs3mP9infc1kgp7tt2f89jbCHcTRI7RzIdxc44Uy6rGw6k1hleoznI7qHBkltR7SbqdvtOsBOLtoZpU6q5QYL7QVXtwZq4x0qAwsMbU/wcINNvxFfvU09VaS8QSqndkk9sK1GbUq9yirVYX/6VHQdKvbR1ermba0UW+yH5sXWi5Jf+dhQN74LfmqMZLzNswuOP/ff3hxy3g050blbODRNkW9jWsI2SZYOr4z81Vub8D+GLNiLie/PVhDUGMxz1CwHgy/nCD+4wS8DP7ncgERVriwPCCs6dbsBXYrW0Q0T13H+awo5VDjMYS+K6GoR3Q+r7jVmHd2G4fP6IRSo7LVMcw== 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:PS1PR06MB1708; BCL:0; PCL:0; RULEID:; SRVR:PS1PR06MB1708; X-Forefront-PRVS: 09480768F8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(189998001)(5004730100002)(50466002)(110136002)(586003)(2906002)(46406003)(2950100001)(77096005)(50986999)(8676002)(76176999)(5008740100001)(54356999)(81166006)(4326007)(229853001)(53416004)(86362001)(83506001)(33646002)(66066001)(47776003)(19580395003)(92566002)(3846002)(6116002)(19580405001)(36756003)(23726003)(42186005)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR06MB1708; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1708; 23:og6HcjcADygB0N4cOT8IFZdOK36kMRkLSr8L2h4JGiZsrZRBHGDxuHQ8uw77RoN4cyfeWQE4THHRBEOPjyj5ONDk1Qb6viacgaK+CN0xfYslAK5DumcoMEgECGUOp0ptBrgjLpZtGKgG1hdu+bCVkpYV2dLelWYpZaSnR/qBWa3W7IQ0PImobTZoyQQUdnNVOiHoVLwDekPGv1i5+FA4gVrlkdb6iyPfTWLnWQR+4qO5HAAmwLUtUSy8lpr2krhNPSKOHiITK3Rjs1EFNCbdni/OFgGL+7FF3y10Z9NlEeZeeAoPgY+2FfPZjHJwhkCYYaHV5TgBF2lTvGYZ15l7WgCZH0Cb/MNqj+hjRoDONg9/DoZwIpt/hk558XjQjwAJkTv3/mFFWok/6jM29nQ6orxrarN0jsgC0wEiCgXGIb9ZCzH4H/xSPF8O+kxcH6aWt1/wb/IbRXgSMdDTVEjQAcOl58ImnSghomfYXR7NmtQRaF1cBv8Yuz/KFvITofXZehhrMsBjjNLMkNPra2zJU1mD3VD7NOjNZnEmwNu+WtzuZnmaxfyNv9PvRcnZ25kAVw0NqZWhutHAs1EWBkqlkctz4KrueOnoKVf81XxVypZhh7bvKewOAeUhTLqKOKuTVBWdz0BAWDgpvg7KwVWkfY5VzeIns8AKZFA85euMBZPGIBxjSR+foiEkZA4Mo7IoNm+eBWIgkl+3MKvgzNH/pzMRVlxvDyGiBhmyhqXqQoFh4a3wZA0y9QZeKm1Qdv139WAjyXJoz3gdYdLt6UxNYe3UbkgNLvsB4QBU8cJxz8lGuhCubHkbWFYGSsoCoDWokg7Prja9UNk3fgrkMQcnEbzA+kd1QP3yMU2RVHszc4N2amk8Oq2mRzvzo/pUqoOyJZVyTcovls+UufrHIHRjoA== X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1708; 5:544V03cS1GqMcxHoA0PPGZ8mKTvozdaHSTi2Z6tMJsZwLOyFD5b7uCC+C5fdgf4euBQ/YujkViNO/bTdBb9ZkEZA7cO7IBfr78djObX62ZpC9gOc9F/mdVY20D8nMlgGGh+gVs7G5wzZUPI6gBAqCQ==; 24:2y80iBk0K+hthVsT7gEs7qlUfwP+aOIAo3IyBJY2O4pcitmDF8hqgxHq8PwQsy/G4qvkJWRBhptL6WD1S+Wh3pS8/L1o8j/IKZmqUQXGMpo=; 7:CMKw2wPKwIf28iUBzwW66tSLalVD05KkqmVg5SjONyequeIma5a8W/+Cxqp5nIkJb8X2+WtPYnVogSjftE/HZmqeBRZRG+vM4aF46CYBvFkAxe8q9HLxH5Oif0e67hD8MLZuRp5VInwwZdWI4lPfzlPLkkLudXn9tZlBRr0zFt1201i6IBhgh82w7bWk2Hxr; 20:1lp1gNODQPiO3HK2X0wJW0ZQm2ZRJbQiEertiy+XQA7lXBXqjV9gq4JJMrnE0mMyTebpb66OburXnjvMUORgCgm6oYTXak0m/kOud17AXYIKermlDPlMgKxmPPoTfsMbaDGPeLQS3WzdRTerZ+SL/y5pRZkh/Y9A6YHZzTsP/kI= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2016 10:02:56.1935 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR06MB1708 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 87f96e8..997f745 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -331,9 +331,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); @@ -349,8 +346,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; }