From patchwork Fri Jan 12 00:47:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10158921 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 9AF00602A7 for ; Fri, 12 Jan 2018 00:48:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87F25288DE for ; Fri, 12 Jan 2018 00:48:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7CED128914; Fri, 12 Jan 2018 00:48:39 +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 33899288DE for ; Fri, 12 Jan 2018 00:48:37 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id CAAF42679EB; Fri, 12 Jan 2018 01:48:35 +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 351CB2679E7; Fri, 12 Jan 2018 01:48:32 +0100 (CET) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id EECCD2679EA for ; Fri, 12 Jan 2018 01:47:18 +0100 (CET) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 12 Jan 2018 09:47:16 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 31AC94B71B; Fri, 12 Jan 2018 09:47:16 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,346,1511794800"; d="scan'208";a="269303648" Received: from mail-pu1apc01lp0022.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.22]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-GCM-SHA384; 12 Jan 2018 09:47:15 +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=CsFPp5zo5BvUVUZWgHwqpkCIE8GQo9aGQQs8UqNeUIA=; b=OpJwfcbuWu2sxALvprH1mn1gtKCC13P6xm7pmjBG7KP5lnfA25yFKpE8HVwJLOpeXxHs2EJldePdhnrfPN1UOGGtDL5UGe0MA+LnN6E9+1aNH+RZCnmuhd0OO75DKrdXLXHSWQI4pILqVmmgUNW6mlaHUKEsFe2J+31wNvZXVvM= 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 SG2PR0601MB1886.apcprd06.prod.outlook.com (2603:1096:3:9::19) 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:47:14 +0000 Message-ID: <87a7xjgb01.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:47:14 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: TY1PR01CA0098.jpnprd01.prod.outlook.com (2603:1096:401:d::16) To SG2PR0601MB1886.apcprd06.prod.outlook.com (2603:1096:3:9::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f9aa370e-0a73-4663-c385-08d5595605f2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(48565401081)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:SG2PR0601MB1886; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1886; 3:QbGnBOVjOSgIJV9ecfVDQb0d3eLY18TmchDHFEj/fBb8hGcI+7VPzex3LgEccEQuIj05nlAXRVvFICPSU67QWwaEKIYYxyuYac72PAjlULnZDQ3Drg+jrJhyxlV3s5CUO+xSSQ8SjW/jfKnrglF15fczgAHELMGKSP54a0iLdUt4Co+Jb+plpi7fONbzBeN8fK1z+ExSxGnANbmG+TBkT2OBoqNNCEGnJZ4k44ihEhVDpo8bwpS2l7sBZ6RwTEOM; 25:hTzP3L0efvtk5uRGgrSHGz8QZ+opoy4ggWPpQh4mllHKildkZBfpgKgF9uZGwKJzGFE4QSEyUmaIrJmpLa2OLmkrb8gp3K1uSJLvmNe0i9rx0Ka/a8jPxnl8oYpuUQow727jmAKA+GmSaTPbQCFPffArphT9k0DT2ugjAsX+aYocVfdx8lK12EY4jkrJ49mMend2IA7f5qTOZ2Zn8QQyIFF9iD7fJTnlRJeQCxqiMbuaxDL2tJ71goSACrk45E4FFe5qbfmASJnarioVt7nO85B3R/rvoD3UJPHmPFYA8o7OBNz5Utm6M2sUlGNh9L3xHtVvTAt6jWD7f1XL43XVyQ==; 31:lkhO5tljxbSFLZQ9aNeJHSlZHMxjKk6q8grm27l5JR1Cyc5Zpw5U/kzoTypy9VjsqKbPUGwDfi0mX6XXWSsdx/5SLpBNJ6JJ62FY0UqkiesSXDMzpjcMjFiiul2YpCBDbeDXve2iZfVR9OqnoCSrShDXuV5qbKizCWZbJfzZM9vjuPcZG2ewmCRfrN8y4/7F8dGSgdQR2bFgpbYfGotu0DmMesJUa8bG05Ljg8iSXJo= X-MS-TrafficTypeDiagnostic: SG2PR0601MB1886: X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1886; 20:+LUocyikU64ZbRrPxCuHJUiNvSeBmbi2QwfYBOl3TTQtRLh5KQ0Eh1hoCsGkleEaTBzYJYAfUH/CjL5s5JHPgzsKzm2G1qTyrREjFcoYEnxz5sy3TBomEwmAY/vcb7VAGaakFOH2+mMvuRMYWHbEPIvp/BAnDg6cce00GtJROXilgMf06yg/misRv0vF0urmxL4lCW7nVEESz7hZywsxXBCl3q46ApaZLu0sdqmx/I2yAUXqctwXuL+aZ1ks71hRr2YmSQTmj+aR5OTUF3L2mFlFRz7AkhX5FRLHmWyxsSU0+ZAU1B/mxJs2LrJZHt1JeMU7AGLRrJKKq4tiGACGCLxU3Gm9TjaF9gPXAq8ibPhKg5pBZJHe4/cM1EgW6hzSK0G9Y7CWEyXGePrN49w3kX8kXZf108f6B8nYOL1fEcOaHfyjqZEFJG5/R7Bo8HPa++2hVZihlGQi2izhJtSi4JIjLWs+vR2/WiFKLlA+GMK3qEl+hQ1CGxpps+NydM3A; 4:nAsxke/yDOp+O8zrLtomeYvemlIYvzTFB/zXwAoudF2EiqrOmMk19c8u9Y1pYXNdGhOawhQTbEmEBHmy14dvw95nbhqSuhUrTd89UszdF8yrhqGx0lKu8jHXnMhjsHRECuir1Nlu5/SevUoq2wBYJPVUqZFKqUlyZ+hkR/7tHcE6b8F/Sz4jQqBlfuFCNf2nGvd/UwQ/Azq5ByeVfSl7wLHT2bZKLYFtDGUUBTzEykL4D6bXK6f5KmRVgHr3OZA/9F6ruRHKO1WkMKMXRORyK8S7Ch1cYaKBWp6zB5s0wdXf9V+wYN6AtlRdAQmJjSKF X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(3231023)(944501075)(10201501046)(6055026)(6041268)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:SG2PR0601MB1886; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:SG2PR0601MB1886; X-Forefront-PRVS: 0550778858 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39380400002)(366004)(39860400002)(376002)(346002)(396003)(189003)(199004)(16526018)(47776003)(25786009)(4326008)(478600001)(53416004)(66066001)(69596002)(7736002)(53936002)(83506002)(6486002)(50466002)(8676002)(86362001)(7696005)(81156014)(52116002)(106356001)(76176011)(36756003)(68736007)(386003)(5660300001)(97736004)(105586002)(6116002)(305945005)(8936002)(23726003)(58126008)(2950100002)(81166006)(3846002)(6916009)(316002)(16586007)(2906002)(54906003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1886; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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; SG2PR0601MB1886; 23:wujjrcl+0Ne3MHiGD3K9hzeYGFAWTvHoGVovM9q?= =?us-ascii?Q?T0xb79ToLQr/l2S0b9tXnl5UJ82ezuR/FgM+uxLkwy2HEUYtke45rVYzCb9o?= =?us-ascii?Q?zn5XjBUc18b7OvGwwPkmOfpfO1K8Ko24izlQud8oEsaEXnu7bMmQwIDqCqe7?= =?us-ascii?Q?bHxzfda/cXpQ2gsqgCFFWoqxYXoWut41E6Va3RIdZ6hOvJmT8yvtycNEsrfK?= =?us-ascii?Q?9/QwDYHTVAaQL6PDE02PeKpYwnNFwVmmDetduwzooT04QeDnusoBwjymJZRF?= =?us-ascii?Q?9LFjLvl3yEmEzvBKQwAzmQKnJdojDSXn5wRZBjbxieCYS47GmFaQIaivC0u8?= =?us-ascii?Q?Zo/AlVMvWVOJ9CEdhhQqxFoOBQsPEmwh+QiyfVJIr/L4orGNck3NeKzLTkuA?= =?us-ascii?Q?0T5eTjwSnbU/dYKWg/fHcmqgCJmb9/5Gj6jeIoV4vEgzEXSXCDICkt9MMcN5?= =?us-ascii?Q?jzngSM1R7Rzilw/vzJbfcSYDzRw50cADV848/lY6ijwuxxJAQAkP6M2nfaMJ?= =?us-ascii?Q?ApaqjikSZ7JTuEN94pnFktlZv0AmH0nNbeZ7jR+BUifEcRcVZaeJpgHx6Yzv?= =?us-ascii?Q?lPo04xn2yRj6ln6i9tbvzvAuoo7d9VgKLsA+RcgfBcDbqk0GElza9LA7vCps?= =?us-ascii?Q?b13oyMo8GezLoF0dkXPwmYX8sc9FVMqEiiVr/Fcj2jxcQFF6BKsaG2S+A4Xo?= =?us-ascii?Q?LWjHVRG2Kul5RJ83PLEfpWVYxUFTJDIS1oav6h8jA2L9euVobJFand7iE4fh?= =?us-ascii?Q?P6tYtjPZyTmw/FKxgQ2gJYfSf6hVEFnS9YFN7Plx8F9jAL1o1Qng/3TuzZXt?= =?us-ascii?Q?774fkOC8WmLv+Z36fUMtRihJH5bw+TQnWSTAhsfbIJyPhxOSqbXjDehT8JMC?= =?us-ascii?Q?LHPAya/eLbMmrVuE34ZHRm1n4q3GQ2pMlRvsh/EqfzLrxmrxnvFjLjR73z/o?= =?us-ascii?Q?YC2Tdd5lsqA8ecJWLm8V0mu5b/cC18tlG00NgbUmQeO/Rj4Z4NQ9gkVXYFVh?= =?us-ascii?Q?ZpDPvL/EGA1rZ/jvDIrXqNlim4r3UmD5oVO/n+0C/Y7RMmvPrNroJQ+e6mfC?= =?us-ascii?Q?X5f3UZ9XOZ3sN/kQgMwv7s2ZIj9WAkIX/X/CWzJ05V4/IpcEAW0zHNG2UTrH?= =?us-ascii?Q?vSGLSRCtg4NU=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1886; 6:Kj0isHtx4HM80jN+j7gSv7F6l/5hhVX22PfIW1YLwe1jIfU4x1wLBYT35O3Gmdpl5gHWu4Qx3yfNL2QGW9ICQBEOw/qOtly7zMEVoNNcEASAT5JlPtyzDCzhKd8TWJ/+1IdBjnJ5jMSGWRmpFDvZ2ds70cqRyYbFizIgqemB6b/Dxn1AgAET2tfqcgtzc4uNWIFBuQm0v+3Pz9Ps43m5OOdfRXRmfz4/5Bj42yWd1iRzgtiin5OObmR3ZgApIqwOQ5Fty37YP1v+FFs+zsRUtsNUU7hvz7n0vxdJIocmFfSEZ8eyvEatBqkIVfiFB/jVXVl/i+9yVpCO+eGeC4rfZOcmaf50xCVlh5cZ1h/klho=; 5:qsByVWbXe9+X/Q0jd+AQzWFbbRTGJtpJqJCoLdJLqUpQyjsiLwLCCloIJK9dqLhIcX9B03TNhGo5tQ+jwGjHYPM+kzyp3AlXGYEB/TfpgCInncb/PQbBcAr8XbxXMxhITHOYp37yGMqEHQ6SG99/AbQyD4OjZs4qTx2MZTQuN8s=; 24:32NX6t26yOupRYjRiYrWyxSlPsiuwDyT+3WzgT6HrCmXhZltQk7R5NwHFv0qpz/YFYe7NywwB5bWuxoCPnY3dECSgo5WcU58vEZ1I8vPZL0=; 7:WxQ6S5fTEoGyOyKn4mYooY6VoLSH3bbivijEvgZIKJ3enYtkjC6ONzj/Aqu9NGh18tlLMm3SuukfXqcm2puxTDGKwPxKsTTr6mVk9auxj6sFooTjP+4ej17BkuS+KiJO/XFe126jUlhq6Ozugo//qNhQxyVJ0vcjlMUY2kTSzXVf/SwvHbRK9KdTplmex1EgTRXlvmgrHK7pyEXhPlG/5cHfrFyoRMCW/lz4UVv/eq/znjkhDb1eMqoQ72XDETym SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1886; 20:DUMjRGa/ijWv7b6sXpoZuQ6OU2N+SEBL23yrXf6ckmwYW+6QuU+tDYYqeJ2PPBWIJPwCx3Iqdp+kg2Dx5t+WERmCJzrCR/oJzWlpAKcZhp5VDst33Jh7CIIgZAlSDycPmcT//esgElW2+wak2WFxydi0mu1Q6HRQ+uhGSJ4nVPg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2018 00:47:14.0273 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f9aa370e-0a73-4663-c385-08d5595605f2 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1886 Cc: Linux-ALSA , Simon Subject: [alsa-devel] [PATCH 15/38] ASoC: cs47l24: 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. This patch merges cs47l24_compr_platform into soc_codec_dev_cs47l24 Signed-off-by: Kuninori Morimoto Acked-by: Charles Keepax Tested-by: Charles Keepax --- sound/soc/codecs/cs47l24.c | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/sound/soc/codecs/cs47l24.c b/sound/soc/codecs/cs47l24.c index be27506..3f34de5 100644 --- a/sound/soc/codecs/cs47l24.c +++ b/sound/soc/codecs/cs47l24.c @@ -33,6 +33,8 @@ #include "wm_adsp.h" #include "cs47l24.h" +#define DRV_NAME "cs47l24-codec" + struct cs47l24_priv { struct arizona_priv core; struct arizona_fll fll[2]; @@ -1069,7 +1071,8 @@ static int cs47l24_set_fll(struct snd_soc_codec *codec, int fll_id, int source, static int cs47l24_open(struct snd_compr_stream *stream) { struct snd_soc_pcm_runtime *rtd = stream->private_data; - struct cs47l24_priv *priv = snd_soc_platform_get_drvdata(rtd->platform); + struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME); + struct cs47l24_priv *priv = snd_soc_component_get_drvdata(component); struct arizona *arizona = priv->core.arizona; int n_adsp; @@ -1177,6 +1180,16 @@ static int cs47l24_codec_remove(struct snd_soc_codec *codec) ARIZONA_DAC_DIGITAL_VOLUME_4L, }; +static struct snd_compr_ops cs47l24_compr_ops = { + .open = cs47l24_open, + .free = wm_adsp_compr_free, + .set_params = wm_adsp_compr_set_params, + .get_caps = wm_adsp_compr_get_caps, + .trigger = wm_adsp_compr_trigger, + .pointer = wm_adsp_compr_pointer, + .copy = wm_adsp_compr_copy, +}; + static const struct snd_soc_codec_driver soc_codec_dev_cs47l24 = { .probe = cs47l24_codec_probe, .remove = cs47l24_codec_remove, @@ -1187,6 +1200,8 @@ static int cs47l24_codec_remove(struct snd_soc_codec *codec) .set_pll = cs47l24_set_fll, .component_driver = { + .name = DRV_NAME, + .compr_ops = &cs47l24_compr_ops, .controls = cs47l24_snd_controls, .num_controls = ARRAY_SIZE(cs47l24_snd_controls), .dapm_widgets = cs47l24_dapm_widgets, @@ -1196,20 +1211,6 @@ static int cs47l24_codec_remove(struct snd_soc_codec *codec) }, }; -static const struct snd_compr_ops cs47l24_compr_ops = { - .open = cs47l24_open, - .free = wm_adsp_compr_free, - .set_params = wm_adsp_compr_set_params, - .get_caps = wm_adsp_compr_get_caps, - .trigger = wm_adsp_compr_trigger, - .pointer = wm_adsp_compr_pointer, - .copy = wm_adsp_compr_copy, -}; - -static const struct snd_soc_platform_driver cs47l24_compr_platform = { - .compr_ops = &cs47l24_compr_ops, -}; - static int cs47l24_probe(struct platform_device *pdev) { struct arizona *arizona = dev_get_drvdata(pdev->dev.parent); @@ -1298,23 +1299,15 @@ static int cs47l24_probe(struct platform_device *pdev) if (ret < 0) goto err_dsp_irq; - ret = snd_soc_register_platform(&pdev->dev, &cs47l24_compr_platform); - if (ret < 0) { - dev_err(&pdev->dev, "Failed to register platform: %d\n", ret); - goto err_spk_irqs; - } - ret = snd_soc_register_codec(&pdev->dev, &soc_codec_dev_cs47l24, cs47l24_dai, ARRAY_SIZE(cs47l24_dai)); if (ret < 0) { dev_err(&pdev->dev, "Failed to register codec: %d\n", ret); - goto err_platform; + goto err_spk_irqs; } return ret; -err_platform: - snd_soc_unregister_platform(&pdev->dev); err_spk_irqs: arizona_free_spk_irqs(arizona); err_dsp_irq: @@ -1328,7 +1321,6 @@ static int cs47l24_remove(struct platform_device *pdev) struct cs47l24_priv *cs47l24 = platform_get_drvdata(pdev); struct arizona *arizona = cs47l24->core.arizona; - snd_soc_unregister_platform(&pdev->dev); snd_soc_unregister_codec(&pdev->dev); pm_runtime_disable(&pdev->dev);