From patchwork Fri Jan 12 01:35:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10159347 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 94AF1602D8 for ; Fri, 12 Jan 2018 02:25:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7AED02894E for ; Fri, 12 Jan 2018 02:25:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F29A28999; Fri, 12 Jan 2018 02:25:54 +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 5869C2894E for ; Fri, 12 Jan 2018 02:25:53 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 15289267B7F; Fri, 12 Jan 2018 03:25:51 +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 5676D267C5B; Fri, 12 Jan 2018 03:25:50 +0100 (CET) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id A1D58267B7F for ; Fri, 12 Jan 2018 02:35:35 +0100 (CET) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie1.idc.renesas.com with ESMTP; 12 Jan 2018 10:35:34 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 9137A6DA52; Fri, 12 Jan 2018 10:35:34 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,346,1511794800"; d="scan'208";a="269310075" Received: from mail-sg2apc01lp0244.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.244]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 12 Jan 2018 10:35:33 +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=UcFn/wjrYt5O1LVbvIsH27oNqXhULo/BRvqLz92cwmM=; b=h+2FDERq7M/Mdm/CB4TiEeEHuH2UE9HQFfhg1Blz5cKcivrLmaBsBTBFr21G5BwAL76t1UPiy9m3oS0hWlF7c/h+jMUlD9WN20XMXDEoFC9jVFzb0r6KsAveF3q50I9J95lu5DqYflkjTYJCUMGyAT3k4Z70iW38U70D/XByN6M= 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 01:35:32 +0000 Message-ID: <87mv1j97xa.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: <87bmhzevk9.wl%kuninori.morimoto.gx@renesas.com> References: <87bmhzevk9.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 12 Jan 2018 01:35:32 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: TY1PR01CA0187.jpnprd01.prod.outlook.com (2603:1096:403::17) To HK2PR0601MB1873.apcprd06.prod.outlook.com (2603:1096:202:a::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e7abcf4d-15d5-4e56-7523-08d5595cc56c 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:leeHpp/+geHn43JaUmRXnX6w0Tbis454SZQwlp8x3349vlqVlbE1ZJbjCgDtt5egxwAy5ZfF/bgriLU2OiGtRXgdMEX3VEzqvFKO3XAOcLjiiKxFkgytJA/18qnq44STPR1rU3TScAYkNpEcHc2UYKsXjLDQ7UhtFYsDizWL+r5Qm2q8/1lpPqIuq77HlcQd4f87Uhb2DoetRO8AdAzoP9HArH+RE5txmAizF+r3ZGN66kGbsf3UuEbuKIBECY2l; 25:Ams1K2Pe2htYeYhzpl69PVY34ztR7xX27RpY6SzeyCwOHIun4Bhn5FVhzOFg7oSrG84ivmdz0+yhEb37yv8ZC3DIps4jwe1W6rpfAt3tnl10jfyWSb82+Qgz9h2Ijn1ptHoX1cVrIj6Vlw/v8tGPTHjto43tAf21eOAylWRUssP11c3k19krcTEL5QFOuf49JEsmO+sA0tHFfI1XF+etooWiZ20w6PQ/DUL7I+fRJClFuwNJrLMIEilwoQVlHX19QOMvNKh7xltdDqkXuXm+XcN2aqsT8QDknjKUlKuqkTOlPeO/1FFTHMyS71x7WQ0F8QfmcTriexx3zZwLrpi9+g==; 31:T8YNf4glND3OY26qmMA0AgXArtVwxvbXfMPvI+sP/+02JHzIxKKijAoB1hmXm4ePdwPOeq4r+0LJwW9el03OCgxPv1tXeaMIOUMsjlGPonpLwOEY3/HCMArN/sEHuV9u9z3Wo/3HLjCnEAyvZdaBml7Hf9YNLAU3gVxfgl1QdI+KLfVPWGUte9dqxN0847cywJD/neKcqHZmHh+PQkA3KCgDXqQtAAtK4gqS6thJPKw= 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:MR6HR7V/RIAZVp08UiyorKKtaOAXc6d0w4UIrf5I2NzBV3Dp810Z1KahqvwriQeZIBzJ6HhD6ts+nCB68wcw3XDgNHbQbXaI8zOH5qSiwNryKV8dJNdyCdeYG8cHsPQ+ujYdCvtJeSUDYyeyNKzCT41hFro+LnvDP+eFgZEkFY4uLGAfaYQjOYc1T6xWEIzDgdUif05GUFvz/Us6Az/FXXrTyBqDmI2tcD1ukY5IYpGlxSBPsQ0M0rY8NxOivQyiM9Uj2n+IdSTnLu3c/NH1eU8rDEU1CNrfLrG0RSwpvg/7TVAwvuXLJfJ2cIp68VBLfx/ybXzZMlWRzQzGoMI8+ptUTebmAkwxhrok+tQgZH+gyOXAmML+S+c8GsbupdA6P3QtTV5QjeRx4KO7tGodRE90G24bVRn0+AQGl2wuAt9yxFHJH9xmKdZYn3hpopIQhfhQjDNPJcsiFA/9Hwkw9b2Qd1H78gOH6stCQDfwRhvJ6atdcVNFXz/jjxGXuBHu; 4:UNtmyfY9GbSiW3HjyEDmt2kzd8ETvOoOlY3/W896+2t5tndmaLcP90u1UsWLykF2sSFnj2quRKKevoDKoOKBwLh+g1bKhKnADQx68Uph349/ftyodJ2c/uCCIK63uzmeHFISkKSgvmKFKiN/gvotewTsCgTLI/gEqmNXPthjmTZgRK+WgRmLs2IaXbGeygKOsepBiFM5P5jtJIy95BH/1mIHfy+AiRooHrFaQZE5IW2Vqu4aVUB8/xOQYkdfZNxhrCH8v/9r2UkXE2d0nu3X4Oy2IaIZvdDtfIXYGGuWdxtj+gDvSsC6K+qehTV0vk33 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)(3231023)(944501138)(10201501046)(3002001)(6055026)(6041268)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123558120)(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)(39380400002)(396003)(346002)(39860400002)(376002)(366004)(199004)(189003)(478600001)(25786009)(386003)(8936002)(6486002)(316002)(16586007)(305945005)(7736002)(2906002)(47776003)(3846002)(106356001)(59450400001)(2950100002)(50466002)(6916009)(7696005)(36756003)(5660300001)(66066001)(52116002)(76176011)(105586002)(53936002)(53416004)(23726003)(68736007)(8676002)(86362001)(16526018)(81156014)(81166006)(6116002)(4326008)(54906003)(83506002)(69596002)(97736004)(58126008)(21314002)(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:dpsAadlJwPqDb5aSNwDpROe5erGBOzPMkpBjy5j?= =?us-ascii?Q?y7Pd43jGStrWejpsdZOiiKb0e7OnWXpCmrZNefoWMxzqBDsK8NM4hRgweuPj?= =?us-ascii?Q?P5JCl0klIOGU7nY+/h5J+3M6OKKzvqVk1TtKyQEX6akHz7CRd+dmJC0Qm82h?= =?us-ascii?Q?vKseo99jLkk6NL+DJmA4lei6+M1NsredFKnZpiusUEKZkcAKmamNDvJR+MCD?= =?us-ascii?Q?Z9bz0lbSe6qmxAccX3Pk3lK440HhGhMLjTZoHnbDyzZju9HhCyUtyqgMzcla?= =?us-ascii?Q?+1rvJwGCJ2S/fIfdgnNFy6EJlJByFjYs6hW29aIQyxJARPZYJNOnL8fudlZW?= =?us-ascii?Q?2y3IGbtG3H53+0Ur1OuijXEv0iwa7GqBHPYlPXxfg3CQaydqJ7fkeu2amYsy?= =?us-ascii?Q?iA5ropoHBsbXXgMdlwoN+5gXqfusuyq7+OD7DqNroFVVyrT2Z8hV/B7cGLgp?= =?us-ascii?Q?34AvGmPf+CSzpoNcEmfsyBsbFsnjgw7WcaTGTc3q2way9vztRyxIL/GC76oq?= =?us-ascii?Q?Fa/jdGtzoWtsNKGCiLs6NyYhT2Ns3czS8cA+khULfzSVz8aIbk8neIZB7bSm?= =?us-ascii?Q?9SLJNi5xlEqp7y9Y7aPiYrfPQ2UaZcewTPf5nYPP/0ti606u6VTUfFeNjiSO?= =?us-ascii?Q?Q68d4QX2Tt/Cgjr+Nz4ao7FHY22wDNYg4umFiqBdLwhqQOyrNdS2hoUyQP2t?= =?us-ascii?Q?+S9RwTtZs4hjbrsjjcr0gICIGkN2V5dMz1IHDhggM7gQ7wpVNLoudOda06dS?= =?us-ascii?Q?NFWCzIHYLj+hhlCtwKHzA+11oyKna0b8EMPbVp0u5PJ6sUQM4QMfwYjT3v5u?= =?us-ascii?Q?lvkrpUL3nXXrUv7j/wdQ6TqYtKExQScmVcEIkfv/U8VEz3CXZVjbTU0y7biH?= =?us-ascii?Q?LGCMSlFnWT4DFJEtLuSXm5DfiiEIxRPSC5DCaT/pzYuyCnBy8Ik6G9GW0tF1?= =?us-ascii?Q?IY3XhIYPo6RCoXOne8aeXTyd2Qphj7IMuYpGXAEymZgfmgSiOBonHZvUkAxW?= =?us-ascii?Q?w8xgRtHXsuD+FlDF/ahuOBlVKMm1aHs/Ha4pjS+XlytnBYajAiYl+jdAaAcb?= =?us-ascii?Q?5m94YOpmX2qtsrimKAailFFE2U7SqksBwISjAdhHDe+qRLHzz1/qorWdBSAH?= =?us-ascii?Q?+0pBHnxVl+md35JGIyfS3fV1+9+c0XXfhSGt977CbQbmdUlo5SKIK5A=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1873; 6:ZjDB8ySWYiN54zOJJ0dSJGBWztmNihDdIh3jotz6Dd5KBkeQltBH+AYvoBIPLOxRyeIN2WApCdXg1f8nittP/fHXJkljyVtkP1+9+L+JfNBg7YDxIt4++4ZK3W9w8SJTTsX93tH2VYy899L7ZJmOJgyn1i+vdKfsFlBfnjWVXAgje78Gov85jn1VCEGNNEF2hYmR7/q9HV42zN7gty/HKXgGp8vppUBdGjCMF2Z+CPzT/gjtdanXIuZqV4mJZJ/qyv9CDSJnXHo6BUa4fGCohDNEiiGAnkfs4CAttpN4BPOPS3/wjPK24b0KVSW5ui8Kyda8yxgYGtXAyNgS6ciztAM7o0cuz6cJkY+QUNuRHIY=; 5:R6S3iI7fT2OLdNSN6pKo3m0KodJu7PnNADD1hEIFzc0HNjwXHKYH9/yId1AHittVn6syEgsdZWFkA1cjqmlVSYaY+8WVaMfqdiOIDJGeUORRtqejDUDzx2I7vCBB9TPZGbE00Qe/bl4bErDkD2BSNQIK3lPIVyjsCMzlSI/1a5o=; 24:U+9gPd5CcqIXFOIF2fsDar55I4W8OEY9svkFWbyeKMB2rWnZQXJzB7veHPe5LiJkie88/3YQqusZYUuu2NFhtg4VZp32mETO+rwVQrhTLa4=; 7:wMOwH2pneHogdM7i/GIZ3c+IwplAVN22jNnG0mXME/PxId5hPGD6lOkvAslQkQi8i2u9mIPsrgu7wfW0otSlz4miOdiChC0a6/5QIlFnPr+oSoR+t5sjC42h9x/OdlZXapPICrMLBbJwp38Hp9XLBe7z9Gcwb6Y4xBrEGmVw2i9whRQRH647JRYo15N2edRO4hT6qIrshnr1XQiM0VAo4LiYuE0W6p0j48JAA58keF/cpwXch3pGZaj/n61yYUJ0 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1873; 20:Nnmn+Zi8eDk4W4iJvp79lwajzUijm+wgWUfWFlVXCoDfeIskJzsogzQ7MwQZ+iQEYztAIa5wl/RvPjdo2tgs1BLiYXItFfuf3ZvPKBvjnUWmlKUuBE0P3NL+FGa1fHeeRr/YNEVD/8C2StJhqMk6Rp5ufJwjYavC13qzc5xb26A= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2018 01:35:32.3438 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e7abcf4d-15d5-4e56-7523-08d5595cc56c 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 093/187] ASoC: max98371: 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 -> .pmdown_time = 1 - -> .endianness = 1 - -> .non_legacy_dai_naming = 1 Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/max98371.c | 43 +++++++++++++++++++------------------------ sound/soc/codecs/max98371.h | 1 - 2 files changed, 19 insertions(+), 25 deletions(-) diff --git a/sound/soc/codecs/max98371.c b/sound/soc/codecs/max98371.c index 7bc2a17..19dcfaa 100644 --- a/sound/soc/codecs/max98371.c +++ b/sound/soc/codecs/max98371.c @@ -187,15 +187,15 @@ static const DECLARE_TLV_DB_RANGE(max98371_noload_gain_tlv, static int max98371_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) { - struct snd_soc_codec *codec = codec_dai->codec; - struct max98371_priv *max98371 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = codec_dai->component; + struct max98371_priv *max98371 = snd_soc_component_get_drvdata(component); unsigned int val = 0; switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBS_CFS: break; default: - dev_err(codec->dev, "DAI clock mode unsupported"); + dev_err(component->dev, "DAI clock mode unsupported"); return -EINVAL; } @@ -210,7 +210,7 @@ static int max98371_dai_set_fmt(struct snd_soc_dai *codec_dai, val |= MAX98371_DAI_LEFT; break; default: - dev_err(codec->dev, "DAI wrong mode unsupported"); + dev_err(component->dev, "DAI wrong mode unsupported"); return -EINVAL; } regmap_update_bits(max98371->regmap, MAX98371_FMT, @@ -222,8 +222,8 @@ static int max98371_dai_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct snd_soc_codec *codec = dai->codec; - struct max98371_priv *max98371 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct max98371_priv *max98371 = snd_soc_component_get_drvdata(component); int blr_clk_ratio, ch_size, channels = params_channels(params); int rate = params_rate(params); @@ -348,15 +348,17 @@ static int max98371_dai_hw_params(struct snd_pcm_substream *substream, } }; -static const struct snd_soc_codec_driver max98371_codec = { - .component_driver = { - .controls = max98371_snd_controls, - .num_controls = ARRAY_SIZE(max98371_snd_controls), - .dapm_routes = max98371_audio_map, - .num_dapm_routes = ARRAY_SIZE(max98371_audio_map), - .dapm_widgets = max98371_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(max98371_dapm_widgets), - }, +static const struct snd_soc_component_driver max98371_component = { + .controls = max98371_snd_controls, + .num_controls = ARRAY_SIZE(max98371_snd_controls), + .dapm_routes = max98371_audio_map, + .num_dapm_routes = ARRAY_SIZE(max98371_audio_map), + .dapm_widgets = max98371_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(max98371_dapm_widgets), + .idle_bias_on = 1, + .pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static const struct regmap_config max98371_regmap = { @@ -397,21 +399,15 @@ static int max98371_i2c_probe(struct i2c_client *i2c, } dev_info(&i2c->dev, "device version %x\n", reg); - ret = snd_soc_register_codec(&i2c->dev, &max98371_codec, + ret = devm_snd_soc_register_component(&i2c->dev, &max98371_component, max98371_dai, ARRAY_SIZE(max98371_dai)); if (ret < 0) { - dev_err(&i2c->dev, "Failed to register codec: %d\n", ret); + dev_err(&i2c->dev, "Failed to register component: %d\n", ret); return ret; } return ret; } -static int max98371_i2c_remove(struct i2c_client *client) -{ - snd_soc_unregister_codec(&client->dev); - return 0; -} - static const struct i2c_device_id max98371_i2c_id[] = { { "max98371", 0 }, { } @@ -432,7 +428,6 @@ static int max98371_i2c_remove(struct i2c_client *client) .of_match_table = of_match_ptr(max98371_of_match), }, .probe = max98371_i2c_probe, - .remove = max98371_i2c_remove, .id_table = max98371_i2c_id, }; diff --git a/sound/soc/codecs/max98371.h b/sound/soc/codecs/max98371.h index 9f63309..06e9ba7 100644 --- a/sound/soc/codecs/max98371.h +++ b/sound/soc/codecs/max98371.h @@ -62,6 +62,5 @@ struct max98371_priv { struct regmap *regmap; - struct snd_soc_codec *codec; }; #endif