From patchwork Fri Jan 12 00:48:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10158933 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 07800602A7 for ; Fri, 12 Jan 2018 00:49:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9058288DE for ; Fri, 12 Jan 2018 00:49:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DDD0C28914; Fri, 12 Jan 2018 00:49:31 +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 D7828288DE for ; Fri, 12 Jan 2018 00:49:30 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 7CDFC267A09; Fri, 12 Jan 2018 01:49:29 +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 884A6267A07; Fri, 12 Jan 2018 01:49:28 +0100 (CET) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 5BBAC267A1C for ; Fri, 12 Jan 2018 01:48:06 +0100 (CET) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie2.idc.renesas.com with ESMTP; 12 Jan 2018 09:48:05 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id CB33862BB9; Fri, 12 Jan 2018 09:48:05 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,346,1511794800"; d="scan'208";a="269303782" 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; 12 Jan 2018 09:48:04 +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=bRxv4mV5sfPPe1gNbRxWZNoLcjrf7V9WvCQjeG6b6aU=; b=BjupfzYp9BkWMJFkAv7sr9tONEF3H6M2tKbnYPiqxXPXTm31kQgbBjIFL1EunZ2maToprpF9jRS02zOdeN8gdVbaLO59NhJutnByMmkex/Uvv2cfUdyQTMyP0XzMe3GGk7Ht6dV2pnNwaiNh/+WYS9Z2A109b95lM3wfBP/gMXI= 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:48:03 +0000 Message-ID: <876087gayo.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:48:03 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: OSBPR01CA0004.jpnprd01.prod.outlook.com (2603:1096:603::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: b411bc8f-2a0a-423b-1404-08d55956237b 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:l6yDNd/byRzrIRQh9nIvk42q8L6ZqXBy2eeb0ijGwLZ/JWbO13xfVpLNlTT00JJYOjKQfgvKz8zEEjlIP2hTH6a2m2IEHvrwes+pmikIkjs04wPamxG9teQ65UJkF4haA/sFI8SHgdxA1h19m0xbQnH9U/Hk+wllirwzWvy8LzRJyXYf6WUKrhVpnTqMU4Aghw4JhOBFiSfYRw47H3pSrEBUs3HzCHp7CH3iQZsgF5/C8Fn57h4f8YVhbNEG8ONN; 25:puA0fqFkJWxMzm/lOxviHqjpMJ/8XLmDg39WN1BLQxHN7TzqsXzGMGp4/N0LhUSDZuT1U8f5ad+J9UaoER13tsZ3tjqmSAWfTt0dWR1/1aVxFQ4dCIARlTUPG80wPR2+uruqVXrUgLPCxEr+RMBEDD8grQPurvBwSNCYlpUABTdq16Bd5SieyG2NkPsxcaaYhY2SdokLE9yzb++h6Z3MT6HIY4zKuko5Q3n6xe427IilFqkyiM02xtNd0UAL3F1bmWTJELk3IPoANQv/vomC7tf2krSlrXkbOdaNC0Sv7k2jSuZWU3dgejxrI+MUnR2MrVnXy47wgMizgmdRfWHruA==; 31:0wwmyS53uKQrlYIBIfsSAPQgp+XeQ9ZvvEoCIgqQw6MGar+oBkBrndg9GbYwTZ5r3DyA9KeshcZv5ptu3SC8j9dVDzIHOHzoobYSF5L0gs1vKdjF3ivZ0+CoCDDWyBLC4uqCUGDuKndOTgvOMm4tdPiJssOMrY72P2zs8oqPAGW+tJjO5Mdc7co35C1MjXWV6o/8Tdx0+BIi+4Vzx1tdEtuRH+dV4EWeJU4sIeViWJM= X-MS-TrafficTypeDiagnostic: SG2PR0601MB1886: X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1886; 20:LlVtq7MzIYk2A+dlH8YlTrcgTGGngqpGZMoodVLk1EBGUzge7xHPNGZWlnttKhd7uTl9zFLeD4OQd7ap4LTLSvBqrnBtXWQEa7f459b+Jk/6akYESXW+LUa0jBTn/DzAbVDHiqJsimBRBF055el6dcJHZxVzdjG7LekGsYElXm1Wm4S356EjTu9JCcXw+cJ9qxhoqhIUSleTuob6aJrxJM2afi/Ipa1Q+VyKoavcMG+2VPRJj/AUxxIYMZVhZei+RmKHfNy6udlB8aWg37hKU0UeNli+ng2eg7OaTHG5IptYFXDbNGpqtsDpxgXejPPOtgr3QSrfoB/4Pvkhs/f7k+Hqwe3EmMAUxamOHtFsePXBz38ZJy2pQSVe5LB/h4t8PCLfwOpdIn1/EKYPXV7oUjJW61DQ+RAImMRgi9KsicPh3yJJNLiT55Ro9PjrcNdyDmo5OL0JIVsqvIsNRHiAYVemP1AZ90TpBauRbLKC/pNS4rnzev3s0GeD7XNjNlC0; 4:lyH4mm6RowHFN4tVx6iuHPheU3q/SKpIjb53P//cy0K0LJVg3GKHkjTxPQqpPNPtCE5Mqf2cREHFOBYYfTCErMsFJd/WYcWgaVPl8yBd8Lz2hhtprGWPkxy32pKUtVPPTYxiRZn2P4yzGpOkgSOCBA0FRrjiByCZ9pGobxmE2W5vwqQavo+tSebtENxLbEPVjam5osUbIxen/VrXhBC5is7Rf/RylZ9cvkdpzn6ow7WL5KogL4voM1jvQxNPXqRVbNw3aySUG/3l6HzkQ5V1mQ1Aq/IeVmljRArPDx6Hb3PORonof0IM4l5nAjF8SVjV 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:tWu2B6aC7azojFk0YIWFA8l4VBHlxYzzZkMs2bB?= =?us-ascii?Q?wzOyozQ3axe2aIinhx/mmSrdHqPN3B79ssZFaSUEu/0CWXQsl+FdKugTuaT+?= =?us-ascii?Q?tXNhSULpWegLPD2+8kVUSuZQcMHN2bc3vDjL5VKJhOizk7i/PMonA7q7Q2Gl?= =?us-ascii?Q?zCF5UxlhDmPAaHm2DK4osyczzg7rv+3lueKyTEZl5g1SaY3JqJ2x+7jTF0yL?= =?us-ascii?Q?neIEDGwJOx9ubb5nl3bcSAJKRuac0HGE50d6x46coiOmB1orTyAOS5cvqoMD?= =?us-ascii?Q?PDh7oKLn/b6fsXGs2HBnBIWea9jBcK/NwiAInvddXgwE8ROt3es0qRV8wnmf?= =?us-ascii?Q?eJGUEEv49muGLO5Ho0UKmdC08ECeI3uD1VH8OjOJOMzSlC4gNItW4INqGQnK?= =?us-ascii?Q?VTC1yXpG2yYc3L4Ffzgwwu69GJZjNBRTQQp8+jZgYKnxchOOZwj1BCTDqkeP?= =?us-ascii?Q?yFcoNwOaw/VdAzpqI4J0O1cgsBfr5bEMXlYjDfEwLw5bMEXNMqhux7gn+TMp?= =?us-ascii?Q?n+1vASwgdkys5ehbSfOhdM/+IM761adZUZnVotLyUccufmx7ijZ9yoiLu+Di?= =?us-ascii?Q?76fkYqtbiXYzmrfrkbKTp+mF+lij/YX1sM3OLiBkqOnKBxVBa3cltNqS8t+p?= =?us-ascii?Q?7hsxmtuBpt6NKT/hmdEADe0iGxnjdEDVUcGYKXxwt7e8PJCdOu5IbIz4wtmF?= =?us-ascii?Q?Zbonugj06+/g3ywrKIGoVSohxhbIsrqZYlhHnaFuU7kflckf+EtHxWT9B58f?= =?us-ascii?Q?8G0rTanbyK/rtV/jfIEscPAA+Lx4KXv29yXkhVO5E1IVJF1Dz5DWNDCTJvRn?= =?us-ascii?Q?DTpybaCv0DnYmCPERd3+kKAfKausBYGP72Nl5WwuSsCmV0OuO3hHbOYCxgNX?= =?us-ascii?Q?iIb+Qm3V6aqR+PRU7Vf+DW/7N+QMKjdZTJDsNzzM7+5ieX4jFnqpT7CXSS8u?= =?us-ascii?Q?LcIyjNEuexZsAFJhgQ65+xvVJPfI6ntYTEC53P1lnTx5EZNQnLeVDCrdwOGq?= =?us-ascii?Q?nKDLpjkvJKGdWnCZ0ygoAbnu/HGKycO2mgb6gKobD1xB1eCX1SjR42HvlzJS?= =?us-ascii?Q?ofiFweIQddtA/EBfHjE9jCaPZZgd5smGxUm2WKhInWRYbsoiIp4bCiqjUOL7?= =?us-ascii?Q?GQ1FXORH3LSI=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1886; 6:it1KuyGK0XWmdOLlZiKfeQIKXWhlphRY/qY7Hh+b4ZANgx2LmIUO7gMlbgQgk0G4HUPTqqgv5XTJ1g5YKo7BgLWIuEP+P5EFeBY9eW2V79WIsNmAftTjo4daycFvqZlL4htwRX5vsXpAZMUAxI9BgMXOqLP8Vf+QHImrM8Z8r/jkOgFbnD+lBcIPgqjXVJUTYy0X7tpxih5k6gIrWxguTtGnqxR8Mf3MCyyfTtkvbPQJ2QfavFAg2bocVtvuFgrTQl1obYDf95ph1Xl+AGcht2PhlbCMv4wXad3df7/34FG8aDo2BAxJhwV+DuV9b+5LIHXrFmjLO/zjJMsFqBZo8b+0E6LrMgSma6ez05Ayq+o=; 5:ROxySpdE4yOcBiE1NyUJ5cyTeWSg4iOreHte0GpkL+pKw43+GqFApgudcSF+B5z8P6IxqmblU5RB3OxRKR7bU9oSMHZfEAsxfJfLTY5KLcmuXjHkpW2IqyfJSHVizkJ4xt1yOv58ATxT6KutUVrSgLpDRmJin40VfOcKBIeGHvw=; 24:Ku6oDa0vC8edfV5n5p/TYBWcApfJEl/pmbtVrHn4tlkB5TwaIiGSyLnVM0f6kTDoOkQS+SNKngPJkUQJr/czNx1kkGQRVA7F3TqJD3Ryc6E=; 7:a+DmJ1issEgLwR4YTPQrPe/nwsIJsfNXEFJe5U7M6elnUwsANb6bGEKcU8MhmGngSNdRtc1DVED/hJSIIeFOPdzbiXq5otxMwuLb6aiwSX2XhHwXN6NhhniB83NQw7ND51PIysweD7ddFQeOUm3kbzUZPvNToThqXDiDizm8Hat6SPAcf+IocUNrNP07ZfO7l4Kf1zolQpmElKwv8TVuzVrTJKdWPITTxdSb4hCLh/0JxHkTTfwCpSRyy3r55iIB SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1886; 20:0a+BKUtq0DAxIMOxhMQdL1UXWpWQw70ikTkfBC5w48MaojkFAw71Mv37ZJlktX98/jOKEcnVbP4L57x4ghm6OnrGDKKNG0aK3rV+ouxjxxbJMwNbnO14sp9OiGRsmIzQ9g56X6v+FYRI8chm4HihngInufDsSZo3aYAhQcxa27s= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2018 00:48:03.5277 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b411bc8f-2a0a-423b-1404-08d55956237b 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 18/38] ASoC: wm5102: 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 wm5102_compr_platform into soc_codec_dev_wm5102 Signed-off-by: Kuninori Morimoto Acked-by: Charles Keepax Tested-by: Charles Keepax --- sound/soc/codecs/wm5102.c | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index fc066ca..a568050 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -34,6 +34,8 @@ #include "wm5102.h" #include "wm_adsp.h" +#define DRV_NAME "wm5102-codec" + struct wm5102_priv { struct arizona_priv core; struct arizona_fll fll[2]; @@ -1910,7 +1912,8 @@ static int wm5102_set_fll(struct snd_soc_codec *codec, int fll_id, int source, static int wm5102_open(struct snd_compr_stream *stream) { struct snd_soc_pcm_runtime *rtd = stream->private_data; - struct wm5102_priv *priv = snd_soc_platform_get_drvdata(rtd->platform); + struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME); + struct wm5102_priv *priv = snd_soc_component_get_drvdata(component); return wm_adsp_compr_open(&priv->core.adsp[0], stream); } @@ -1992,6 +1995,16 @@ static int wm5102_codec_remove(struct snd_soc_codec *codec) ARIZONA_DAC_DIGITAL_VOLUME_5R, }; +static struct snd_compr_ops wm5102_compr_ops = { + .open = wm5102_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_wm5102 = { .probe = wm5102_codec_probe, .remove = wm5102_codec_remove, @@ -2002,6 +2015,8 @@ static int wm5102_codec_remove(struct snd_soc_codec *codec) .set_pll = wm5102_set_fll, .component_driver = { + .name = DRV_NAME, + .compr_ops = &wm5102_compr_ops, .controls = wm5102_snd_controls, .num_controls = ARRAY_SIZE(wm5102_snd_controls), .dapm_widgets = wm5102_dapm_widgets, @@ -2011,20 +2026,6 @@ static int wm5102_codec_remove(struct snd_soc_codec *codec) }, }; -static const struct snd_compr_ops wm5102_compr_ops = { - .open = wm5102_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 wm5102_compr_platform = { - .compr_ops = &wm5102_compr_ops, -}; - static int wm5102_probe(struct platform_device *pdev) { struct arizona *arizona = dev_get_drvdata(pdev->dev.parent); @@ -2109,23 +2110,15 @@ static int wm5102_probe(struct platform_device *pdev) if (ret < 0) goto err_dsp_irq; - ret = snd_soc_register_platform(&pdev->dev, &wm5102_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_wm5102, wm5102_dai, ARRAY_SIZE(wm5102_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: @@ -2139,7 +2132,6 @@ static int wm5102_remove(struct platform_device *pdev) struct wm5102_priv *wm5102 = platform_get_drvdata(pdev); struct arizona *arizona = wm5102->core.arizona; - snd_soc_unregister_platform(&pdev->dev); snd_soc_unregister_codec(&pdev->dev); pm_runtime_disable(&pdev->dev);