From patchwork Mon Jan 29 04:45: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: 10189243 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 589BB60388 for ; Mon, 29 Jan 2018 05:07:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 492462876C for ; Mon, 29 Jan 2018 05:07:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3DA0328786; Mon, 29 Jan 2018 05:07:15 +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 25F452876C for ; Mon, 29 Jan 2018 05:07:14 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 04D2B267E23; Mon, 29 Jan 2018 06:06:19 +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 4D180267E21; Mon, 29 Jan 2018 06:06:18 +0100 (CET) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id F022B268080 for ; Mon, 29 Jan 2018 05:45:18 +0100 (CET) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie2.idc.renesas.com with ESMTP; 29 Jan 2018 13:45:16 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 4981A68A42; Mon, 29 Jan 2018 13:45:16 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="269598401" Received: from mail-hk2apc01lp0210.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.210]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Jan 2018 13:45: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=kPuzQPjU9+S6bb8yBwZVfz9ABO365hkgPzqxNue2/OE=; b=WmZlOBqns7PD8prZOnNcGsYzx5TuYrGOhbuLOIHTRAn5W/A1ssAIgRJas0uDokXxEyM6aRCMevNLQz4njKXplZSYkueV+11Q9MMo4ilrsmRGP5qO6XKGnY+hG7NEFKytc62KXeWZa2zoR6kGV7xYbQakSPnmWOQgEcPsMoaKDnE= 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 HK2PR0601MB1874.apcprd06.prod.outlook.com (2603:1096:202:a::18) 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 04:45:14 +0000 Message-ID: <87a7wxuvej.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: <87inbl5q6q.wl%kuninori.morimoto.gx@renesas.com> References: <87607l8k9i.wl%kuninori.morimoto.gx@renesas.com> <87inbl5q6q.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Mon, 29 Jan 2018 04:45:14 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: TY1PR01CA0165.jpnprd01.prod.outlook.com (2603:1096:402::17) To HK2PR0601MB1874.apcprd06.prod.outlook.com (2603:1096:202:a::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 148fca53-1099-4686-81b0-08d566d31695 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HK2PR0601MB1874; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 3:8n1Crm/noO0OQGUnnHjk4VzH1d3MJMVJU9TsUfhFMLjDHrjDdW9lcPWQfpHxn4hiNybTP8OCBkuSQnqej6MUxOw3OlptoDSBr59Y8I35pqSghCLKeir8Ua+GdK7SpOWU2D+9uDXDetjBvHgTRly64UmyeFUsZf9q0jxlTzLgo5ksXLxGaqM1VLV3F42aSoQH6jMLTZxc72EW3PUJTZnGyPDRr4/lkMAqFykZBLi0nn/YuiuHCswDdY69gz6/edV8; 25:nwy2XyE/zVElaJAo3Q6Y261zuSW7uN5V9EuMaKLxswmZ/vfiPxJMuDPpBmN7vSY7MBGtt9BuS8F3cm1ngjDxHBrYbnVUfwKO144G1LWFQjvF5adAS+5162zOtW1JlzOFcAJLyZJ1vF/awaDnW4SHOzdoUYU1zBQs913nPfDz56b+zH9UgkwpMvnm/XsYg9vLtXO7qcnkMoFsqs9mdYViCbayJk5M4BvOotqIsY9ozZBvxXbe7kOpBbRp410AC4JK6i1oNYudv8nkB+qF4N15cs5J6sOsyT1mA3WF7ZtStreTIWkHM8R/dvx3KcwTanITQSqQJEpcq4/NX2eLoyMO5Q==; 31:Q3d/Fik3eTvnGWI6lISUscXBYgEkgX8vZTcT2Yb3TFELNg9NvGH71qotoffj89wL7HhGQ0/V3sAoaoDHKt8YIOJATo+dhBr5kJYS6MA26Wv4LQbSAsfJS2qX4ghh0Tlh5ZyZdQl6p81knhqNrf3pBNzCkMleyUyYDiT/iO7fdG8i4a3B9s/vKObN+hQNxMFAyhxkTp2TLWuyjrjUtI7gQ+Z1NRh+t4sscpbuz3Nd9fU= X-MS-TrafficTypeDiagnostic: HK2PR0601MB1874: X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 20:6LBnsmdyWMuJ/HA96jURuLnmq7cMQaq7tox/5ZORaVzUbn71PIk7eUxTHxtnWKk0fWPiOPmTJ8tpM9wpVhJSNfdc8G7q4X9lL16ByJ9ncEGz+A6ysTuzgQowr1fQ0WyQIRmCsF1VHOaz4g6z+g3dF8IHBaPT5ZqZaX+Kkp4vxhpfMf6hQdW6RT9+djrTQEPomrhXb4NqRzWlpakv3rV0bB+cfay7uizNroavKu7NywDi7t8tz2Y9FxD/LsLx9YalYPqbvACCqcC150kdvUR0WwS1BsOKF//d4l1J/NNuFGz/zTxYuh/oCTbsnjuUwE6lwO9KvvVLQXAlJ4S4c14PtNC5v321YWoBejsGgFB6ciFrlIXw/apguCwvxxe0YnnoXvV/+37wR/4/U4FdcfHdwiBWZA5SkKtavElqkHIZ0Z8G9twOZDuqa8pAhfGPBy9eMuFRCIdGc6f95eGK4MdpZasS/otR58X9EYJjQLYZnOoBE1a3BdI7apuvPK/eS4za; 4:XA6x8uaR4jL6C+yEUHWsBPSjB8uFJaUoTI9NOQAEZ252EGmEQw/LYv8nwNlk/N4m/fl0uBHcJSkSpB6VG3JkUQU+9JxHrJ6sxDPt2GM0b9rwNOZjfGOFUo0NeWC7s3+9I8hsDAyjZTMTKuDo9USFiQkduBMtY0J4FRhmDhkvWJVZ0CS/NiaPTygKy95uzjsfDarI1992DCtm7+EPLCTnJGH5mmqXBcTi1ScecM47ILUkuzRHp59031maSWfR70EcB9fDR/5RcmEx9YwwnZoRkXoMF/jgifCAORsJikAJWf75PCOiW89qdJs+Sgp53PTG 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)(93006095)(93001095)(3231101)(944501161)(3002001)(10201501046)(6055026)(6041288)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:HK2PR0601MB1874; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1874; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(346002)(376002)(396003)(39380400002)(366004)(189003)(199004)(53936002)(53416004)(59450400001)(97736004)(6486002)(47776003)(106356001)(7736002)(305945005)(7696005)(76176011)(52116002)(4326008)(25786009)(386003)(50466002)(36756003)(58126008)(8676002)(81166006)(68736007)(81156014)(8936002)(105586002)(16526019)(186003)(26005)(83506002)(316002)(16586007)(2950100002)(6916009)(5660300001)(478600001)(23726003)(69596002)(86362001)(2906002)(3846002)(66066001)(6116002)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1874; 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; HK2PR0601MB1874; 23:6ealOyo0rgvrsDZi84YrHadwMpmmxBPd2ry2xCu?= =?us-ascii?Q?KipdCa7X7uiHQDTjTlNby2EcwLsGvLXShWZSSFWC/D8iXwN83odoi/9EBcsK?= =?us-ascii?Q?Z/v8X09r3tzYdXM33TnypX98O21A+DLBNsG7qnOQK0rcw/zAOcIr6j++7cq4?= =?us-ascii?Q?jdnfUzj2U6kSlerhsa5TPQsc33hSmzYbRTWeoQLlro2y4NRb1qfp1RybFJNH?= =?us-ascii?Q?sd1LFivC+2hZHVoxCuBzUjcq3jJAffwihQZGXxYnYwkcEGgnuxhxKwbwn0pX?= =?us-ascii?Q?0qLkbhtGiUVxexWcWT3A8TTmNbWEH5aEiEv0TUoEuwZF8bvpNaObju+JCMfr?= =?us-ascii?Q?zrmpBssIUy1j9daVc7ZQldaswjZVjuvwijTn44Pxcquu5O2Fyf4CRFPUfSyZ?= =?us-ascii?Q?RXG//5gQum6A8KQ6324UeH+/eQtDCOu6SolNyxNLBjYXO9QFYZBCXZPeVSVa?= =?us-ascii?Q?08BHEOWQ/GuWZkaMjseLweUbSSqO6ZCZlEFcQWlD7EV2g/7OxToXQOD6MwRi?= =?us-ascii?Q?SuOvBo9nkrY7gG+js3nsVlk4OUgOcyfNNQkrdWgZ5ShmLfKg8gzLqf/12pY2?= =?us-ascii?Q?M2FtbZcZY4cZJjPLQ7d7b4n47pegtfJj6y5X576LnSLFgpKXlgBYjesPg0Ni?= =?us-ascii?Q?kaoGplhR6eJyEANFmfpuMyFPWSX3AospCOzLvMZr1gKcbmmYpmHW13VQ0dRj?= =?us-ascii?Q?U4A2/zQQTsOzc43RM+OWCI+UZA18PC2uLzCBbpqU/yPCfs4y8JS4SXQSPiu7?= =?us-ascii?Q?xcuBy8AGmmWQ3uzBx/ecWMDmPWdJbcWzoOzyebkLLPxGXczKVlcrLE/6CidX?= =?us-ascii?Q?W8gc2phXJ05fmV5xhtXA7wGdfyos9pZi9qQ7u+EejfHw1bInA2jyYV83CSqp?= =?us-ascii?Q?l/5n62m1Or6RRopcfCsONBz1BryRyWEGKtXrXkFwdAh8BlM1HBAWJUkpvRkv?= =?us-ascii?Q?M1lSeC76VEnTig/3EoxyffYekXKNmoyNz2jZoNIDs215qg70A1nHbHZ+I/TZ?= =?us-ascii?Q?1gX0BO5Hvo4iSMwYgAeqIDYILvKumWkdmIKtquxivQoM7VefooCM9dDwSP7l?= =?us-ascii?Q?tBiW0NG/AD6KE+qVLJNt4OqDhBeLdWYYlbVmgQkfDnYq+NVpCeVDwrNZAbt6?= =?us-ascii?Q?IcRhm29oWijYGXhHogdI8Dw9xkiRjSh6BfbdX7aG4d+JhFRyHRh9/h9sF3Sg?= =?us-ascii?Q?huSqbv8nUgOsTwJ0=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 6:wMl99ykb9vNre3Df2tVF2M//gRc9x+NrgDSqYKZqBgDEiJS8otOEOYK7v3L0lFlZSROe5Rm7L0p4I6hDJSbWCSUoSnQcMWKbwUqW4V3vfx7cJ6qNX07IbycTDc8bDx7RFfpY6Agk6OG+igP4doHX0hLGqSRHfujfZ2VUXYGxnhAstHZXbLCmThsntlaj6fAITuhfF9zQIizk02xMG9Y2xbbUXPKzo6/0yel4CHef2t28bj40HqGLH6SGed7OBic4KqgClkCG4waaQ6wyNwbg3fvpSK2REyFVVzXQWHu83WljXY05zY1ou3dtT4bWmkjCVDXuPyN856r6CCiLmOfub6AkhUSvY6qg5tUteEOVIfc=; 5:iG0Uu57TsegWFcSuqxgrH5Y6G3DTGC4ZkLr6O0QufKQ8t6ikC+mJqwq4X2bSxO5o7zBpxalmq2xpJolzwUcrQZa/AXV7+EDQ/iyt9cLYC5DQ/TZow744B43LN5luh3ONVNAW8PllOZWbUXs4vzpQFtJBt6dFMqWCrEfT8SY2LFM=; 24:qG84UNp0C964P1UFu1OuMWvMKP9DdiQUz3o0MmWTbsFn/uHWAyx7Lc2H0SbKP95iNIcl8QwHdVpiA/6/1FcAq4BEGrhoeM7ocGSn0LDX/Tg=; 7:MkED8ADRvf6sJQRhN/N8CuQ/T3XcpuMycq78jbENeUD7RGxTbPkWE5MnHb8e99NX/ntVKkCggk2KviwgXltNKca3eTTDlHetQvoHpn215JPb5Kdi+gRD46zM0FLF7N+p+sW8+1TWo40meiuM1/ku5dzvzI1qWE981ABja0XOybPjWtO4Mch8ONNSOlHSZiNOhI7A3/hEXt68vlyTlQh3+ycJDKJV1nraVtTB99ykeFgG0edRHZlQuC+X7DVtNfEr SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 20:RYWsSGGrWBdd4BI+RLnOEWpob22KwSWv9MmHKNgHs7Os5jg/NkMoGXVTJDQV831hirTDa4pZGMK4u2/kb5N6W59bI9NqnZu7qz2wwoHxBu2qn2iMBibnjc6wy/BhA6piRQWQCfIP58WVuTo/3ztFAHPg0ZKpfN7xzQIP+Aq5zVg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 04:45:14.3166 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 148fca53-1099-4686-81b0-08d566d31695 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1874 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 180/186] ASoC: si476x: replace codec 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 we can replace Codec to Component. Let's do it. Note: xxx_codec_xxx() -> xxx_component_xxx() .idle_bias_off = 0 -> .idle_bias_on = 1 .ignore_pmdown_time = 0 -> .use_pmdown_time = 1 - -> .endianness = 1 - -> .non_legacy_dai_naming = 1 Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/si476x.c | 42 +++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/sound/soc/codecs/si476x.c b/sound/soc/codecs/si476x.c index 7b91ee2..b779c28 100644 --- a/sound/soc/codecs/si476x.c +++ b/sound/soc/codecs/si476x.c @@ -140,14 +140,14 @@ static int si476x_codec_set_dai_fmt(struct snd_soc_dai *codec_dai, si476x_core_lock(core); - err = snd_soc_update_bits(codec_dai->codec, SI476X_DIGITAL_IO_OUTPUT_FORMAT, + err = snd_soc_component_update_bits(codec_dai->component, SI476X_DIGITAL_IO_OUTPUT_FORMAT, SI476X_DIGITAL_IO_OUTPUT_FORMAT_MASK, format); si476x_core_unlock(core); if (err < 0) { - dev_err(codec_dai->codec->dev, "Failed to set output format\n"); + dev_err(codec_dai->component->dev, "Failed to set output format\n"); return err; } @@ -163,7 +163,7 @@ static int si476x_codec_hw_params(struct snd_pcm_substream *substream, rate = params_rate(params); if (rate < 32000 || rate > 48000) { - dev_err(dai->codec->dev, "Rate: %d is not supported\n", rate); + dev_err(dai->component->dev, "Rate: %d is not supported\n", rate); return -EINVAL; } @@ -186,19 +186,19 @@ static int si476x_codec_hw_params(struct snd_pcm_substream *substream, si476x_core_lock(core); - err = snd_soc_write(dai->codec, SI476X_DIGITAL_IO_OUTPUT_SAMPLE_RATE, + err = snd_soc_component_write(dai->component, SI476X_DIGITAL_IO_OUTPUT_SAMPLE_RATE, rate); if (err < 0) { - dev_err(dai->codec->dev, "Failed to set sample rate\n"); + dev_err(dai->component->dev, "Failed to set sample rate\n"); goto out; } - err = snd_soc_update_bits(dai->codec, SI476X_DIGITAL_IO_OUTPUT_FORMAT, + err = snd_soc_component_update_bits(dai->component, SI476X_DIGITAL_IO_OUTPUT_FORMAT, SI476X_DIGITAL_IO_OUTPUT_WIDTH_MASK, (width << SI476X_DIGITAL_IO_SLOT_SIZE_SHIFT) | (width << SI476X_DIGITAL_IO_SAMPLE_SIZE_SHIFT)); if (err < 0) { - dev_err(dai->codec->dev, "Failed to set output width\n"); + dev_err(dai->component->dev, "Failed to set output width\n"); goto out; } @@ -239,28 +239,25 @@ static int si476x_probe(struct snd_soc_component *component) return 0; } -static const struct snd_soc_codec_driver soc_codec_dev_si476x = { - .component_driver = { - .probe = si476x_probe, - .dapm_widgets = si476x_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(si476x_dapm_widgets), - .dapm_routes = si476x_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(si476x_dapm_routes), - }, +static const struct snd_soc_component_driver soc_component_dev_si476x = { + .probe = si476x_probe, + .dapm_widgets = si476x_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(si476x_dapm_widgets), + .dapm_routes = si476x_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(si476x_dapm_routes), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static int si476x_platform_probe(struct platform_device *pdev) { - return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_si476x, + return devm_snd_soc_register_component(&pdev->dev, + &soc_component_dev_si476x, &si476x_dai, 1); } -static int si476x_platform_remove(struct platform_device *pdev) -{ - snd_soc_unregister_codec(&pdev->dev); - return 0; -} - MODULE_ALIAS("platform:si476x-codec"); static struct platform_driver si476x_platform_driver = { @@ -268,7 +265,6 @@ static int si476x_platform_remove(struct platform_device *pdev) .name = "si476x-codec", }, .probe = si476x_platform_probe, - .remove = si476x_platform_remove, }; module_platform_driver(si476x_platform_driver);