From patchwork Mon Jan 29 02:43:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10188733 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 1A0D8602C8 for ; Mon, 29 Jan 2018 02:44:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0194628798 for ; Mon, 29 Jan 2018 02:44:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA696287A3; Mon, 29 Jan 2018 02:44:52 +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=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D8EA28798 for ; Mon, 29 Jan 2018 02:44:51 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 543712675E9; Mon, 29 Jan 2018 03:44:50 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 1F3CC2675E9; Mon, 29 Jan 2018 03:44:49 +0100 (CET) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 7B52826768B for ; Mon, 29 Jan 2018 03:43:49 +0100 (CET) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie3.idc.renesas.com with ESMTP; 29 Jan 2018 11:43:47 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 87C006D590; Mon, 29 Jan 2018 11:43:47 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="270905161" Received: from mail-pu1apc01lp0016.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.16]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-GCM-SHA384; 29 Jan 2018 11:43: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=m3FRFHjujxNg+G7zNTn24EGd+vujWpl8WxF+caGU7mY=; b=jY2NnuDPjL0Z0PP0eK3pfroCTs3jI1QVPzanVN3DjKRIcadJQkfMRZOthNcTTCYdn8FFCWld5tBIUzFQnA9vqNog2Wu+D75HCsnTh/KCvghZHYKpa9aqT0qJWhkmRZTd1x2PMZlnSwvw+mPGqXrMdZ6h0T5E/AZ8qp+mUcLRkiw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.138) by HK2PR0601MB1876.apcprd06.prod.outlook.com (2603:1096:202:a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.444.14; Mon, 29 Jan 2018 02:43:45 +0000 Message-ID: <87mv0x75di.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown In-Reply-To: <874ln58k4s.wl%kuninori.morimoto.gx@renesas.com> References: <87607l8k9i.wl%kuninori.morimoto.gx@renesas.com> <874ln58k4s.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Mon, 29 Jan 2018 02:43:45 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: TY1PR01CA0200.jpnprd01.prod.outlook.com (2603:1096:403::30) To HK2PR0601MB1876.apcprd06.prod.outlook.com (2603:1096:202:a::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 79bd6d0d-d4a1-41df-b5ff-08d566c21e38 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HK2PR0601MB1876; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1876; 3:nOUNFYOIdfrpy7JI6ddO/JNfnYQIUiaTIIdEQY1uQfpcCUw85eyDr/RzuVEo4cwwvkG8pdzI3CJ+aKepZC61QgiLJGSmBOiGoWj7F+/9NC4jwUjuXL5AmTpv6hyKaxcSu3weAhQvWVm4xspR+wt3NAHNr779tYyKbaYNxLNsrvbXSnhHQ83S9o7mYdRZc5Lx5maMGyZLTg2P5UBVE9g9Q220FUEavKrfnH+NPGf9KxVO58OmUrXqhbO13HTsSmT8; 25:wDVZs6JP6I726gR/dOqfGwxpiw46z87zENz3zycdlQtd9JSxBKg+Eyr0lf5KVCYZXFwobvax4KHY0qjp5+JrNa5cGabI+TA7nqEYwTwDm7QcNJzPdOP9eHAlD8XGrlXq4e0uqxu10FzYVwZV3dNd7PmetTYkq8Y2q8Lxw/ewUPcjrJaSXsLBTX5A7If9GhkcZLRpXuxbUcXiYUSfeggkE7uoJFGo63Kl8vZzONWcfe8aLq0aQf99F8jzLCnevDdDo7meHFW54PlL8wMng2DtpamrevCK59XcC+CqOfGjkAettHNSdDSXkhRe/zOhU80K3kyDSbp3X1daWWXgjT+YUA==; 31:GW/uMg/aKUoZx2B+d+2f8av0MAgz8gy7/a472aSyeiFcpYnKGUuFH0Wf7MhIIQFS6xhaUELWrJK3HaExuBxhkjY83vKZ0Jbljweix2Q+WymidLcgwna5Nz3kHk5rHGcg1TYGFGjlMc5qCa0RGABEyW847cIdEzoHKAaWKd3vsLHkVjXIJq/2Gerrgw73N3/5Jg9mt8A5oy6i3pvw5JYEwti29wlGoHCIcYAYmsBtoFc= X-MS-TrafficTypeDiagnostic: HK2PR0601MB1876: X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1876; 20:RJ70xG2Hxt3LcY7rv+xPVOVdWgqaQXW+kvgo040eIVolnKWN9I2jjutWUPiBu5/Y6ms4nLoL8t42O2g3KVmJjUch6LfO5BWWuHW5l06OLU9H2SAtSeR5SX1kqXeBBQ/SfqxEiTCK/Y2HJM7JwShozper9UFTdKzuEZlHva0QnV/rHE/a1gyIMnv2Nm2ZIPBR4uXLhxUCdRKuM7IbwWpwBfa8cf8/nqxPz60UPedDMV3vjzJmxzy9y49PV2gswH0V6mXNS905gvZStadVyQeiavVqG1AOxjfQi+fYEcgc4YWUXsB6epWhUEXY+RLNbAu+vBg2l8tmx6qrPAocx+GBO8f/clQwfNlO1h8NeGDa20EfgXylAZWj/xbmoZh4vAtY2jCQqGukAjhOc9MTvN4fDVZaaoqXcwXAfLQM476klfezITrOLHOf1EwrheKR9MciqsgbsXg3v0Hz8Yeon83FRIo04PY1gDQlY5ReBsaF6Uv6QLhibjLmrPlsIwg/vqDz; 4:LMlkOFtRV2/LK9TgAgj3JBEKkVViDc3qRJr+ZPTtixTsyneB77xLj1NvGxxsjWVFAhGcvAJvMF+UnuBF9z+0Qgqhhn4BWQI0UpkXPGSeyU1bFeB8hxllql4mBGv4TvOdz9zog3qnTuF5wuuAe1zyl0s9I9Z4SbswqLHkITFG6+NpRm310cHCaJso7tKfWpAij0q+lbDTUAhjZBewp4t1jI3s1/7iEN87LvXwNdOJoU8y0rsHICNzidqpztO8TRI6aP2ZK+mC57yKMy7WNvi0bEfsQEELcZPeiuRrE9usCLWBanymHjbTXZAxsq7G6YHk X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231101)(944501161)(6055026)(6041288)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:HK2PR0601MB1876; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1876; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(366004)(346002)(39380400002)(376002)(39860400002)(199004)(189003)(3846002)(386003)(68736007)(4326008)(16586007)(6116002)(36756003)(106356001)(478600001)(53936002)(2950100002)(6486002)(6916009)(50466002)(26005)(23726003)(53416004)(8936002)(105586002)(47776003)(66066001)(5660300001)(97736004)(316002)(52116002)(186003)(76176011)(305945005)(83506002)(25786009)(86362001)(575784001)(8676002)(58126008)(16526019)(81156014)(81166006)(2906002)(7696005)(7736002)(69596002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1876; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1876; 23:urg6Ydkt0aK2mX0VdqJubD4khK/yMdSIuTDY33c?= =?us-ascii?Q?yPDPSE3LftKXbkD82ORxnYreIjOfbHgWfUhO6jryleg3hkbcxWZTrRC5WCoj?= =?us-ascii?Q?nZVIqxTxvdlzkZor6RqMCcLNA3mHK83Z9Nu667fZWYtzu2O3rdksZe1SrF9b?= =?us-ascii?Q?CkwwqV+NOj4uki19SPdvm7/IzvXKK4zCzpcZZTJumEqj3NHKkp994abpghMy?= =?us-ascii?Q?JhB6tKGUVHVRN9KppYtqZAI3APPjDDTkepXfoAK8aun+WipnlOE+APcy3K6E?= =?us-ascii?Q?BlX2n65vf7uz3lKBHMMOes4CgwjjJM1Wk7Ci3ypiEqnuEV5vkUfziQj981ul?= =?us-ascii?Q?izotQhsZtQ8ceE75ldhpLqB9kygyYSbSjNzbG/h6NmZ+yIidg4AGnLzoyBR2?= =?us-ascii?Q?addFHW+n2UwNE0CIxgbxHV8H7oKiFbHdxdVIgNXQgCDw9m5R0xNOFH8ZOAX4?= =?us-ascii?Q?2P1VKS9X9G0ZZ0Zb914pgwCKGdH7XsrvGvQ64NF6BFWnBMf+0pcEwKhldgsi?= =?us-ascii?Q?RiYt5X1CKFl/pX7Q9IoTdQGA64q0e9uimkFJePs2DO+UYQ4p5LXa182fBTOf?= =?us-ascii?Q?I7vJXFIjdQP8jX3bC2MpsvMqXbhQqiR9BM17G8Mdt/ur5Xh9KF6wYF0+7/f2?= =?us-ascii?Q?E0q/QAI5uwwqL91OmSKCWjvEj2Foe/cho/+YDdvq6c9GaQQNE63Yf8xT78YK?= =?us-ascii?Q?G7qvy9H0r9QHPINH/qPp3KXV0hncYsANzRUP6EGpFuJy0vx8+b47njS4evRv?= =?us-ascii?Q?8o7x5/aw3jVeMiz7sOD2UfV0CF9d8zvD6+hVqzYNSd3roVniV9lcXcw736g2?= =?us-ascii?Q?r2NArD0Nh4J6IbhzLkoHfFuueyi+kt5BRdruenMO9uqY2pqGg9s2rOiqnf5o?= =?us-ascii?Q?/hGmJqrUR8J9Q6JkO7kJPaa/WkcmdNr0c9iHzbp70DUyqMxrO8cN00JKEFiN?= =?us-ascii?Q?S+qXIVAN+7fU6z+jmeiNPRxxtm70Hpa1bIrKpfvd40p91px+Kp99RRpudsH8?= =?us-ascii?Q?79qn5gBd1qiO9nCVvQ0gFW0UPDh+1YnPvFV5KpZtdR5Gyju/AJhcWZ8wG4Sr?= =?us-ascii?Q?20Vxa9QBR+trI5U8DNIAYURn3TTFvET7r/l0Cqfh2DwQkGvP/fqU2g8eg84a?= =?us-ascii?Q?xdYy2NAw7VDwJYrF7c4KYoxSM7JEN8GAu2ZYcGiao922QVY4biS4WBg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1876; 6:BLP5qHjx4GqehT8XkMJy6yQa2F23+3UuD4BS3/LzOwHqwVbubp0aiesk7NXJUQTLudJq1Zd8ztWZGl/CGwtRut3K0zrdp4BSrm0ZZqRjxyImWUq1I3T5jPwy4wC4s1POh1YbzH+OOGs9BloGeAeaACUDgDCPLTxd0FhXJniqtMGqSxzN+xgdCxpyYEYCla19jEPad5sNco270IgPQMdf90dpuEUJYI8E0cxho2yDEwObK5E+qVHWZQiLkVJBiLWIxNCT6hD6EB3dZyY9WdIbaqKgQjrc6wnbjVGRhnrv+zsHWRGuoPu1n+2V9gCoEmZ6ZlStXBDCJJGl+JkOpwrvC/f9ob9h3plbIe6MdoiBdMg=; 5:OmuCl7ECxAx77d4u7DQ6P0CRGp9MiKD4vTUJ9A4f9ybpgZaZ/dotT0sZTHuzcas7nmOOUKOXh/HJZALKgV8sRPjgrQb8MJvpq+cZcZ/s7qw8gV8St/MwOHi4cIrF049LVIOfIx+QpLWaeNC6LEr6FVHbjRDIk4i1SPbncz4VJpg=; 24:nQQgwV0m8ZJklJ3bRwJRa7lqkgaLkWkVJtBzfxP54Oa26C2njhGtHPiqD4z61F1stTeK4+2uVCL00h5VRy67Mi6s8x5tcUw63Desv/aSOMI=; 7:e6PLFV1DQk1d35KxwlH+3+Wg77BkkBqkpFzfRajxgqzEWKOvghSZmiin2aUUiLMDvCAtvooXSitNhlsfdwIbymFn3P1vtvcOVbJDCGTIUF75v+uleCKZho/uDwiSe+eWjA6pNgbA3eNYyU0fsyXcthK1F87bgf0Qfa5CpOzsuLtTbYwWRz5vP6/UfTJywOmFY47tNYGBOBlbVSpqnCw77vYxhxqkkE/kyXzVix0iZXYI0ZdFV5LnB+zQMNN/ZgEJ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1876; 20:SLE00QqvR+YjfO1pjHQqfkGEI/RruqSc39bwI1Z37HukSTV2QzcKdUWgEbutzrzbr6d2ukl1VRL+IY6Jvzn791V7P0TjTQl2igxMx6KPEOD96StlcdebmVAAKmOkYZN9SnhYxmkW+sjeE5bj3vWSoGPLQu0SUwEyxHRhdcvn4Kw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 02:43:45.6546 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 79bd6d0d-d4a1-41df-b5ff-08d566c21e38 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1876 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 12/39] ASoC: sh: siu: replace platform to component X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto Now platform can be replaced to component, let's do it. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/siu.h | 2 +- sound/soc/sh/siu_dai.c | 10 +--------- sound/soc/sh/siu_pcm.c | 9 ++++++--- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/sound/soc/sh/siu.h b/sound/soc/sh/siu.h index 83c3430..6088d62 100644 --- a/sound/soc/sh/siu.h +++ b/sound/soc/sh/siu.h @@ -183,7 +183,7 @@ static inline u32 siu_read32(u32 __iomem *addr) #define SIU_BRGBSEL (0x108 / sizeof(u32)) #define SIU_BRRB (0x10c / sizeof(u32)) -extern struct snd_soc_platform_driver siu_platform; +extern struct snd_soc_component_driver siu_component; extern struct siu_info *siu_i2s_data; int siu_init_port(int port, struct siu_port **port_info, struct snd_card *card); diff --git a/sound/soc/sh/siu_dai.c b/sound/soc/sh/siu_dai.c index 1605029..ee22116 100644 --- a/sound/soc/sh/siu_dai.c +++ b/sound/soc/sh/siu_dai.c @@ -727,10 +727,6 @@ static int siu_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id, .ops = &siu_dai_ops, }; -static const struct snd_soc_component_driver siu_i2s_component = { - .name = "siu-i2s", -}; - static int siu_probe(struct platform_device *pdev) { const struct firmware *fw_entry; @@ -786,15 +782,11 @@ static int siu_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, info); /* register using ARRAY version so we can keep dai name */ - ret = devm_snd_soc_register_component(&pdev->dev, &siu_i2s_component, + ret = devm_snd_soc_register_component(&pdev->dev, &siu_component, &siu_i2s_dai, 1); if (ret < 0) return ret; - ret = devm_snd_soc_register_platform(&pdev->dev, &siu_platform); - if (ret < 0) - return ret; - pm_runtime_enable(&pdev->dev); return 0; diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c index 3118cb0e..1729095 100644 --- a/sound/soc/sh/siu_pcm.c +++ b/sound/soc/sh/siu_pcm.c @@ -35,6 +35,7 @@ #include "siu.h" +#define DRV_NAME "siu-i2s" #define GET_MAX_PERIODS(buf_bytes, period_bytes) \ ((buf_bytes) / (period_bytes)) #define PERIOD_OFFSET(buf_addr, period_num, period_bytes) \ @@ -340,7 +341,8 @@ static int siu_pcm_open(struct snd_pcm_substream *ss) { /* Playback / Capture */ struct snd_soc_pcm_runtime *rtd = ss->private_data; - struct siu_platform *pdata = rtd->platform->dev->platform_data; + struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME); + struct siu_platform *pdata = component->dev->platform_data; struct siu_info *info = siu_i2s_data; struct siu_port *port_info = siu_port_info(ss); struct siu_stream *siu_stream; @@ -604,9 +606,10 @@ static void siu_pcm_free(struct snd_pcm *pcm) .pointer = siu_pcm_pointer_dma, }; -struct snd_soc_platform_driver siu_platform = { +struct snd_soc_component_driver siu_component = { + .name = DRV_NAME, .ops = &siu_pcm_ops, .pcm_new = siu_pcm_new, .pcm_free = siu_pcm_free, }; -EXPORT_SYMBOL_GPL(siu_platform); +EXPORT_SYMBOL_GPL(siu_component);