From patchwork Fri Jan 12 00:46:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10158911 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 E87D2602A7 for ; Fri, 12 Jan 2018 00:47:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D581E288DE for ; Fri, 12 Jan 2018 00:47:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA5B228912; Fri, 12 Jan 2018 00:47:41 +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 92081288DE for ; Fri, 12 Jan 2018 00:47:40 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 68E44267985; Fri, 12 Jan 2018 01:47:38 +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 C1FE926797C; Fri, 12 Jan 2018 01:47:36 +0100 (CET) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id F0D53267986 for ; Fri, 12 Jan 2018 01:46:18 +0100 (CET) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie3.idc.renesas.com with ESMTP; 12 Jan 2018 09:46:17 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 75D9562A57; Fri, 12 Jan 2018 09:46:17 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,346,1511794800"; d="scan'208";a="269303569" Received: from mail-sg2apc01lp0242.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.242]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 12 Jan 2018 09:46:16 +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=U96vlWqSZgAJvJZEz65SKSr4SK120LKvu07cjOkOYG52fpAXOW4QmReEMKGvo5+vN9xM6FrzIwbSOwDu13EnjzGrSWO9aVBi/3K6cFSXhUyKJ/YuQYR7l54Q8GE4uRCq5Wdz5SA1e80tc9q/N5ZCk6K46FZHzhFth+KXcEajQOs= Received: from morimoto-PC.renesas.com (211.11.155.138) by HK2PR0601MB1873.apcprd06.prod.outlook.com (2603:1096:202:a::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Fri, 12 Jan 2018 00:46:15 +0000 Message-ID: <87efmvgb1n.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: <87vag7gb9o.wl%kuninori.morimoto.gx@renesas.com> References: <87vag7gb9o.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 12 Jan 2018 00:46:15 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: KAWPR01CA0076.jpnprd01.prod.outlook.com (2603:1096:402:c::12) To HK2PR0601MB1873.apcprd06.prod.outlook.com (2603:1096:202:a::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 183e10f0-ed27-4b18-cc2b-08d55955e2f1 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020074)(4652020)(5600026)(4604075)(48565401081)(2017052603307)(7153060)(7193020); SRVR:HK2PR0601MB1873; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1873; 3:8CMT2gi8grg8/tOugBn9E1x6VgIjbI3Vsqix5j2UK/vBTy8SRIzGt/nhGT4e6ww2e+86cW3ZtowbW1zQusYXmEYPp5Mrzh3LTzuA5EEmJHe+0fttjBk31AcqKy4Fgqsx8+Dqse+toiSiUXdX1yr5fbo1tRZKqKgzAiKA3iGMx3M9TF8c507wjZTnlDzVbQOZ6sCL1qip+iu2aVuY7ehHVs6650UEQIiue+fmTiONSAg+IeNNw7aYte09fg0B5ZlY; 25:4hsHMh8C8VxN2VgQk5YtHQus2go+myqdTaog5EIOup62wDmeskzqGe/r1vYd+tjVDGIHyCwGM/VBiwC4jfbeIG23JJEqkGWe9VRaW54/sDbgfbB1XAfMC3mpTVc25rCnMxgEvUjqn9HKSU85F4FnZSHwLdCMHCYi/Xj+6xRWB+e4H75es7rMkbJA+3g1sJCM6qxjahJfw5znOCDq2ys0RqpZiDR1VmnLI2THvg7B22gHHEBdWR0HQ55AonJNpWH5GWA3033UWitDoegl36ep8bwsllBe/I2PbbDjLq72pcPNtJ4Rc1ATvlAcsLFOjf78VnFsVencFt44x4n39R5qCw==; 31:hAdX3VHSuyLDGCV84Tkzp864iJqBS60lCe5W+//CFWuojRQV6qerHgnIdK2wd2aage46jQS5MeBAGtZK2YvAiKP79FhCB2YmJVl23SjzRlNuKGdkg1DhqiyNGKTo5yDtAJDu+1OZenEBvh7BVBEANDG+LB5ju5UJSZcl1LBr2VfXoaJH03B6DWmCs7aUzonvLMYy8d0XWJhpj+ZRDcFbmCC0BxVGO+g5ptbCUjbxgXc= X-MS-TrafficTypeDiagnostic: HK2PR0601MB1873: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1873; 20:fr1P1Oh51R4MkEpBqoUJynwPQTIpO5yIDeDvpPdpcT38W0Jks7rQRaNNWCjwdva5jSp7bRFEM9Fy19qkr4CHsQrz04Q2pX+so7FBRbff8tT6x7B9xfb+RF73PClXXpDdJrdK0Ry3b8KjPsH9T0GBs0msHYIorkgzV3eU/m6e1ec4BwMuP2xYglEnQWw0ayhiTIHZ2O/3FQtvxB4edCP8L7c77/+MxbV4eORzFQoelpU4c75BKXQpxa7sWVdt/B2p56YsBCH2bhPUrpzcF72p1tv+AWd9KwMPexmK91GdEc+siaWds6F+3CLM2VS1pwpV1EILjWmIlbTOhnXILwBHEjyh4CQjVYWNRzn/JgimHHa1BSRCJxQ9ZK8CkMYCf4VM3SiZdMnkZvxJs1YtpvrRqlwCzhTEs6zGmnDOqF1bH29PacD69K8TdG2PP7Et0WID81J+BPsiRDdkhs6qiyipC1HeJ7qP/VVTgJSSWPhHAsiDjdUy/MiImpgNvpNQ1sze; 4:1hbNFc0lHkdm4Ivutn5cp+rrkpy5fK/hEkrPYTEidfGJHVnP8yGxAdtXQmp9EWGXDQjZDEYBPj4uQKDJvPGqVcGdlr6IOefkTe2IULLOxG1ROAYrd625nqCnE/hv67VMgTOGIVcB0Vv9r+MCioa/HHLQeTY4z0jUtA4huprizgdcKJWzdC7kX4/DN+1qlu1cj7FzlWJ0phhzUaIIBcbhAk1N7LFWUHHF22XJPyPSIKmOdhrwE6a9shrTFUJYVzofvpyOl2qg0WlWBV8WaEYYZdwGRO1JtD3PKLgCd6rbi2Gc652fskwXn8Bi8iNuFI38 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3002001)(10201501046)(3231023)(944501137)(93006095)(93001095)(6055026)(6041268)(20161123564045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:HK2PR0601MB1873; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HK2PR0601MB1873; X-Forefront-PRVS: 0550778858 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(346002)(39380400002)(396003)(39860400002)(376002)(366004)(199004)(189003)(25786009)(478600001)(386003)(8936002)(316002)(6486002)(16586007)(7736002)(305945005)(2906002)(47776003)(3846002)(106356001)(2950100002)(50466002)(6916009)(7696005)(36756003)(5660300001)(66066001)(52116002)(76176011)(53936002)(105586002)(53416004)(23726003)(68736007)(575784001)(8676002)(86362001)(16526018)(81156014)(81166006)(6116002)(4326008)(54906003)(83506002)(69596002)(97736004)(58126008)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1873; 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; HK2PR0601MB1873; 23:j76w5wHY1yGI8vc2lArjDEed2FYZ7HrGV4zBEgS?= =?us-ascii?Q?tHfgD8ox8OxFcGA5ixzHWADfgU9vGtlxnKTjsJX9fEcaJDYw2OPLdip9ibpp?= =?us-ascii?Q?labpKEXWtRYbpXYR1n8HKeLSg5aHR3bvsLYPtg6KhKm4nVOlhgEsyKwFpDub?= =?us-ascii?Q?7+YEAjMhWOvqnAZu8Wty9SuRWc7Iu6SB1I+ovLGwSIBG5qimgv7rLeNA5qzf?= =?us-ascii?Q?OJ7XvcaYsqrz4tE/YdwyPHLM5Z1KM4BDw6rAn2SvRyIJBiNYku9z333DTNML?= =?us-ascii?Q?Gx058f8dvlF8N/3r7o3Bo/zUCjc78AWPq8V4k4Ini4fbzQaPlz3pWDxRpxRp?= =?us-ascii?Q?Jq+RUeBri4TNallUp0H/eNlThbTz5qqMZzR/S2Gtw7CehjNXSPeLjg1DAN09?= =?us-ascii?Q?w07R7TlZaxykdUGZ9VAByj0vfC2GIozxIJViL08/nW/vd9Lj+XalfeVSNkip?= =?us-ascii?Q?FK3JbWIfkBphn/dBYZnrPPINimzOIjIKiqIyK/md86kYspJx3XeZ4FrgBQYG?= =?us-ascii?Q?fOTKx06BI7yfW/hU+07XGn2OJS088T8QuKvbwT50esnil5JPICc3GBoL+WHX?= =?us-ascii?Q?Rm3Oq7K8B2cfcHzhZyNcHSz3behRfQZG1j61FhKfWVJDtGNqHR7rEGfVAWUf?= =?us-ascii?Q?L63KwzXofx57k6Htj7SuxN3l/CfBqyjmlNyaCH8NKjjg06+Ipa3eewuJaxSv?= =?us-ascii?Q?HlpNnOhBSdNDpHhUHN20r95QcKYmlfhZDchfYCsdsyNTYNyrPo9FW9kLT/fY?= =?us-ascii?Q?yKSLSfgurpqIIC2xzKH7N2p3i9AIzFmRDuCmdIRPYEmyPSv+BVRxayRzYmWm?= =?us-ascii?Q?GsMidYZXx1S6iTUh22Kr+7f0Ov24H9YQpcH+DbkRizaEivI60GPaP8BMrYI+?= =?us-ascii?Q?ByFZQ/NNbaC+j38ivVQFi7f60LEtA9g1s65PqWNESc1QfGekpmy5x9OVtGWk?= =?us-ascii?Q?6OtdyGkHe75uo0TEIB1f6UOJzFDL2M6APrX97PvRxfEkmt4T88caYu+a0rKR?= =?us-ascii?Q?qQ5q8fD8miNlKIbIJr1rOJMV+6mp5F33cYbIo6GNVVNizAPlLALCIw6rHT97?= =?us-ascii?Q?fvTk1lm+wvc37tA+SoiBBRoZg6PXA/x62OBXOhpsh7QQtluowuiDxYlpbiOi?= =?us-ascii?Q?qRHF7se2TKZT27HynidhukEl1rF5uGI2m?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1873; 6:QYaMH0YDQAU1GiaOTilG/j2tcPVrTEsOkXa3BxxO72KwFqnqsdNz8sUFZhbRu3c8OTwWBG3tpTNndq4T27mhbeO7ukV2OPFbqAEXRcmiB+cTI3AgAL1WVsL8z2gsZ8dJB21emPzggD+P0zp8I7LyYeXNgIH4PxYLY1Pme+Rj+sfZsnRJ/82mCWMIoJjqdpcmmlQt1AWsCle8LQla+jWlIO1QYs52xOt0TVwkUL/thbWsGO5P49X9x8F12Hm6MEfkt/MZsjvNuhwr/psQP2vRlyS0REZT3U6RStgXlSB5TxaPdxzHKBX7CNMVuNNrgC7lwnJo+DAx8Xt9P+N7VsXDDMBMeq5GQik5z4kloRVA+h8=; 5:TWwm3vbpJWd9NdzgyGHUJI2Fo5LFjeJJKfQZuYRSy6lx0x1mpGB4GthIoQVO5DMUCxt/9ogUw5UjdbiGLDtj72k2/49ulNPy0tzqJeHpR1OQsi1vlbaFksPGP+G9NZLkmVzvpty8dS1Ub23FLLfXxRvhoeInr/RGu+XUtAhS1y0=; 24:Yavo/n5kfpJoExishNSgXlHKmbkeoQ+dYR5DrpKJxppiWEB4/OCoizvdcL8AR9uJczqc8AA37cM58sfN03dTzdspwUhDviD1y8hFEnOqphg=; 7:fe9SW4AUW196WOl9pkYi9Wsf/BzPrbe8RZ0mCt1qbftquBQT1U0fzwOeLDPzsjrGZi61pBOvUenqkCd3wXqBm8nJNwQgtQW/nkrefB+l12AEYhUdIpKWkLIV1KDx1BlfBx5J/Vk3+Tj9iEOj+/BrY1xNWkd/bYDIpi+QmTZKYzyHRuKhykQ0iKUAnCrUJFGO1QBnijBFSxLPVVfCnT0KknawjDKDt5Lz/tjJ+lGSI1UkrfQbRt0I/zkVdwHKKYAU SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1873; 20:hiKXoG8M5as4lhkxbCRaAWya8mjDpX4JHTMQfgs5e99/s49iAdc4D+mbPTdT8+xRsvezFbtsJiBe4Izs/i8CnIQFTYGZJQSAzlr4ldccR0MviYBTjW61WrA43AvQ5o+V4o5ezt/lKFcKWVXO022gwMdQ/qqL8lIAMhNrXhIAptg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2018 00:46:15.3788 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 183e10f0-ed27-4b18-cc2b-08d55955e2f1 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1873 Cc: Linux-ALSA , Simon Subject: [alsa-devel] [PATCH 12/38] 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);