From patchwork Tue May 31 09:09:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9143927 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 D08BA60777 for ; Tue, 31 May 2016 09:09:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3D1127B89 for ; Tue, 31 May 2016 09:09:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B837B28185; Tue, 31 May 2016 09:09:45 +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 0FA0527B89 for ; Tue, 31 May 2016 09:09:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756998AbcEaJJi (ORCPT ); Tue, 31 May 2016 05:09:38 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:58404 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756900AbcEaJJd (ORCPT ); Tue, 31 May 2016 05:09:33 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 31 May 2016 18:09:32 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 6C3A650639; Tue, 31 May 2016 18:09:32 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 6B6411806F; Tue, 31 May 2016 18:09:32 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 6333E1800A; Tue, 31 May 2016 18:09:32 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id UAK12228; Tue, 31 May 2016 18:09:32 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="211980974" Received: from mail-pu1apc01lp0018.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.18]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 31 May 2016 18:09:31 +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=licd6GltWtD/VKfFoSUVb0J4gpF1E39b8ToO3cn9oqI=; b=fTKTCVkKAjfYoz2EGJZZzG8uMJTz8vxNSrHZx4oZEFLqYoOc5DU0PdDEIiKerYY/+9pvwHne2ExAPoD2Bp1ky/U0d2Emksdc91bsynj86BiiLWO9HZcpxCWk2zkDYLABAQJwJCjczaiBDA4Aznxus5/dl2i/cL8OGiDJYQ7jIyg= 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 SG2PR06MB1710.apcprd06.prod.outlook.com (10.167.82.140) with Microsoft SMTP Server (TLS) id 15.1.506.9; Tue, 31 May 2016 09:09:29 +0000 Message-ID: <87eg8ir451.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 26/39 v2] ASoC: rsrc-card: use asoc_simple_card_parse_dailink_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:09:29 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0090.jpnprd01.prod.outlook.com (10.165.51.178) To SG2PR06MB1710.apcprd06.prod.outlook.com (10.167.82.140) X-MS-Office365-Filtering-Correlation-Id: 8f56a773-61ae-4f72-742c-08d389334604 X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1710; 2:YY0ZaMMyc6NrklvYJ28amf9NrlNG0cZlslToGBP8jtLqG5EX8+GWFLfv0YvW8MHRxheUGA1lOXYia7OQtaKdo6i54PYDHw+bK2bTRAEg9RWGNfPkKm8qLrYun3z0YUlsc9bVNXf0wvYb+1vk+czADCKzz5XOgmVsCBa+J9u6C/Y8otZVY/iClfDE13asRkPS; 3:YgzOdf/MWeu8kY3A2euwVK3x9Pwurmck5mmqGxU2KS+gfA/EfBfbuBph4gNe7pPpHI+Y+CdbO5mdQhhSmGxhgxy3yYFzo323r9NC++Rtj3nKDPU0dEVq45ncOE/8iiXg X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB1710; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1710; 25:Vceg6C9LJLYJH1UzxkqhDXrA8ubPdSoYjvWuiTEkI799TQCtVzsTMdVnEs+SXAsBpIl/ZIknQ51DA3R2KGF14AY/PFT39asYTstQDcFckK+g5OBOdop9VZhLDqsgg1Detjj6GSC9lEQXc2dQ211DJaoOwGF3r0Z0w1NvYbCHXBblvvxorSDocgQw6jOxi9Eh9g8QHeveQaWPrrrhqZEgeOLvWdkRnK3JVM578rsFD3a5K9dUdKk0DrfdYcICb0jL4vNHqj5kmfqplbof9bj/AuiyyHm5DzQtV2GsBJ4ahzppbiUIA43ywpKzc1rZNDOhpWaUoG3Pstxk08XnEi0/zZFcK2ZJvcwwMdVXOcgzkEDTlnA8GJABT94/K45jnblEZtanjcFxoD+ykyQaTrdOucMQU0rVnkDMt5e7fC15AP4U4/XzbZb0rPp12Cytn3XL0ndYf30JCd/vTzYkqhWpYQgsE1Wvp2dMTXrnNov5D1awKl2wp1wHGplDP+QAO3xf+KAkh5WJqsjdoFNyjlUTkgi6LPBZSXFx7Hr0m60KLPmaG6RaQ/pNaJHCIBwaErcES61t5QQ871OaHUn2rj/hEiUd0+sjoh/ejoiJCt8sPO7621a14qCmp9/jcTPO01TwE1fESTX/0RcoQ6zo7Qjx6xgSf4Dh/ReVk5o1S/glfoBWA7vjFoO5ys/30/qHGqU+ X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1710; 20:XaemgRm4ulKEIt8b0qaFWBJMCzvJTB43DrbDSp3YG0xaZqRnQHOJTCOfd7jFVfAOamarAFyfZ0pTh+a7Fim91/1O0oaAS7lsoeKYg4COOPbfaPh7ZaJTi1VKDS3ErecIeI45EfDB4Y3iMAzHyfQBSukbKu1psIcgJQ6S/yF5kj7bsdKUgseSw1WpJPYqQjXTKuQ36I7JuVLz5Er/Dv0FExc/1pKMKGlpwIi4Yc5ZziBq0/VJnztxCQzHCO7g6l81HO6ZckycpKwejkSC7/Mvg9CNBEIWMdJrTcn17J8Sj3p3xwA64XsQr/bBfJdliLMmLFBphsTk1y34kr7xkuNfi7XX+W7Vgn+K9i6DpVCxQJvRYvyEllB44fvCRFs2QX/xkgShM/UmmYMrgtKU1J4UDfp+jdtGrnvNmDi/qU8+red/Gj0oiXunU1GJqBH01KO9YZnjiacZpU4bFKZfe61cqvB9xfGKrRw7B6X8QpGs+UQpybNZPATgNtCthVm1jr5f; 4:6wxXZnXk+gsWOU26WlynRai0RCgRDF+WNmET0BQjDN4DSxjL2x0DMsZwfr+B3vI8jk2gvi0Cx+bP/332wn2sijIGUapAeSH6kr90Y+JEy+Oqo0cF6VR5YOjcvccVbEqgzKBgx0hwxYxGRd6fOBtH8hkahLaoCKoWQrjdhIjO5PMoiavi5TzC29GXvaFvRGqPxkQXwXaKteBvihdtaMC95vrD7MIAD4BUGCKg0+Qz8g22IrgkuShLcJAK9FOZtRp5tHB3jVNOQC4IPiMmkuPzDUe0XKruPD/Yr9zWIl00lm1UdxbSWlGsPZGtjtHXLEUATaws4MMhUufwJg8ODIrbz8Ujr5AtwB5diV0JrEfDFsT9cAn99nRw0ZE2fz9lF5Avf/6JfWYLXZOLEK1ZszCbVQ== 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:SG2PR06MB1710; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB1710; X-Forefront-PRVS: 095972DF2F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(76176999)(83506001)(81166006)(4001350100001)(46406003)(50986999)(54356999)(33646002)(189998001)(5008740100001)(47776003)(86362001)(36756003)(19580395003)(8676002)(66066001)(229853001)(50466002)(19580405001)(110136002)(6116002)(3846002)(2950100001)(586003)(77096005)(42186005)(23726003)(53416004)(4326007)(2906002)(5004730100002)(92566002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB1710; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR06MB1710; 23:ujFwQBwzO7mN11aV2iDRoqqjkbSOfQmqmuVNbHTPm?= =?us-ascii?Q?Sn9pvrgO4/6dMxh1Chne87tlJSSLpnH9I/oxt/OiqZoXBjYCuy8lOCN5qDiB?= =?us-ascii?Q?gThZ6dig7IYwQD3O1MeExpnKkylCQvdJxRz81GS0govOLLSYks4KynVCncIa?= =?us-ascii?Q?YGF+eiU8LRhBi6vdwb0l9MSLUXY7GbbGbcDrBY7oL9W74kSIkKpydtknQP1/?= =?us-ascii?Q?Q9uhFhRK/nzNfu4mscopF7pK9xTLV6cKOP/hHG1d2SW1+SJgSYoXuph7hh7Y?= =?us-ascii?Q?FXXUMOp9iu2fHphzhG9ZBtgXyPfi2iasP9568P4mB2+tglre1f83JDo589Uj?= =?us-ascii?Q?pyfRr1zd3uQcprxM3K7mb3fymeX5TFOICfQmJ87MSL8Qt8nzCrx/8lpJzrmW?= =?us-ascii?Q?TlslW4eX2uemdUDghj1C2TPcHtBuk5m2CyGeMv8nP6UazmFDcG8DuaVNe2la?= =?us-ascii?Q?tSfulooyI6bzbl8l2ziGjhjUnfO+VDTFQD0ow2mJAr0pqlQ7VB9wyEtS68uL?= =?us-ascii?Q?xzwlxOSZuYo2GXJqbmjhR+UeW8rlhmVWGg3Z9bQM1y3Ou5+seuAZdsLGAFWp?= =?us-ascii?Q?sZJKNbMpPoIaw1E7T6umiEVAg6OFbaaQ6+60v2wXxZlaOgUasBSIyFgTr/UE?= =?us-ascii?Q?7y1EZxHrrcTR/jA2YmnkgFu7HBD2vryX1+/qaR73ldoEPQtAef0OrhKyuT1A?= =?us-ascii?Q?k+/7pRa1dNSWGsDkug5qhJH3sF3wTpPGhTpLaF5WbjdoSCvR0BBA/fpRMIy8?= =?us-ascii?Q?bPiOnpZgfKmGbCWteemLA7f7ixMmrLyTjkjUkUNKG7zmi54vDFbQAsf8gjSd?= =?us-ascii?Q?om0HS3BffJaom4Dhx//bJP8fNamkDu7xFmBl9E1sPXJBTj3wlx0egdPgcTas?= =?us-ascii?Q?BVGY+X8ilw8ldUYykW/zHp3313wxcP+CCnzcdXNWULME5Re2D6rmymnO8/5x?= =?us-ascii?Q?Of5uS7qnwCpjkBaR8fgnPunF4z7KqyRicPy5su9Jg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB1710; 5:u4tOoG4A1WmCuVkgZ3nmKtfmdT3gHeQvqd+FATe4kCkk7Akg3eo3MDAExTefShTZ5gQNbXSGw+BUJq8EM2U4Lt2mOrkZDkYwG5fuvOjLGavKLJTUh39cVjX/7da7FSR9VQRZJ7MUie3pQnRQT4qnow==; 24:mYHyG9z0+CeP4UCLmSQ4Vd6VNAQ/wJfuUh4UoIO1JH3qcgaqpEkiXyU6ikP1teC5+cn/zzCTe4tLpDkKdNaBYk2Esb1pH0s8bSSGsFIb4+M=; 7:Wf/pzI4bVaKKM3VgmqKZDff4yPQPI4si316J6SYbUntP8siE9hKhHNcbEeErGPExX1tOEy+KkgxoN77ZeV+ONfgbBr4uAcNrUL6dWaqg85e3r6VO727BHAvxIXHA8Ps+Hw/mYLjsn6WjtiY022DNhBCntXfgk642XVAWPqzrKbFjxgq6/sCbgW5fF7hkMpnT; 20:HKeQq/p/9P6h9DDOTQ1xXgR3QDfMeAaeIkswmyQhhnAsdOyrTXF/m37qqUIPkaUuNkV7eyDj7q0kYdLc9lpEzPA3iZla6HuHrO8WBj7q4BjSV/ZRZlL6Q4LYtCSHt8z7cPrko643RnAhhtBjk0QyQVIsvkFObo3mCD42urKjM1I= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2016 09:09:29.3687 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB1710 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 | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index c065a6d..aad8f8c 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -47,7 +47,6 @@ static const struct of_device_id rsrc_card_of_match[] = { }; MODULE_DEVICE_TABLE(of, rsrc_card_of_match); -#define DAI_NAME_NUM 32 struct rsrc_card_dai { unsigned int sysclk; unsigned int tx_slot_mask; @@ -55,7 +54,7 @@ struct rsrc_card_dai { int slots; int slot_width; struct clk *clk; - char dai_name[DAI_NAME_NUM]; + const char *name; }; #define IDX_CPU 0 @@ -163,6 +162,7 @@ static int rsrc_card_parse_links(struct device_node *np, struct rsrc_card_priv *priv, int idx, bool is_fe) { + struct device *dev = rsrc_priv_to_dev(priv); struct snd_soc_dai_link *dai_link = rsrc_priv_to_link(priv, idx); struct rsrc_card_dai *dai_props = rsrc_priv_to_props(priv, idx); struct of_phandle_args args; @@ -200,10 +200,6 @@ static int rsrc_card_parse_links(struct device_node *np, if (ret < 0) return ret; - /* set dai_name */ - snprintf(dai_props->dai_name, DAI_NAME_NUM, "fe.%s", - dai_link->cpu_dai_name); - /* * In soc_bind_dai_link() will check cpu name after * of_node matching if dai_link has cpu_dai_name. @@ -216,7 +212,6 @@ static int rsrc_card_parse_links(struct device_node *np, if (!args.args_count) dai_link->cpu_dai_name = NULL; } else { - struct device *dev = rsrc_priv_to_dev(priv); const struct rsrc_card_of_data *of_data; of_data = of_device_get_match_data(dev); @@ -244,18 +239,16 @@ static int rsrc_card_parse_links(struct device_node *np, dai_link->codec_of_node, "audio-prefix"); } - - /* set dai_name */ - snprintf(dai_props->dai_name, DAI_NAME_NUM, "be.%s", - dai_link->codec_dai_name); } + ret = asoc_simple_card_parse_dailink_name(dev, dai_link); + if (ret < 0) + return ret; + /* Simple Card assumes platform == cpu */ dai_link->platform_of_node = dai_link->cpu_of_node; dai_link->dpcm_playback = 1; dai_link->dpcm_capture = 1; - dai_link->name = dai_props->dai_name; - dai_link->stream_name = dai_props->dai_name; dai_link->ops = &rsrc_card_ops; dai_link->init = rsrc_card_dai_init; @@ -316,7 +309,7 @@ static int rsrc_card_dai_sub_link_of(struct device_node *node, return ret; dev_dbg(dev, "\t%s / %04x / %d\n", - dai_props->dai_name, + dai_link->name, dai_link->dai_fmt, dai_props->sysclk);