From patchwork Mon Jan 29 04:43:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10189237 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 0AA4B60388 for ; Mon, 29 Jan 2018 05:06:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EEA752876C for ; Mon, 29 Jan 2018 05:06:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E39B428786; Mon, 29 Jan 2018 05:06:14 +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 F07F62876C for ; Mon, 29 Jan 2018 05:06:13 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 10576267B8B; Mon, 29 Jan 2018 06:04:05 +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 79B99267B91; Mon, 29 Jan 2018 06:04:03 +0100 (CET) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 93FC6267DF1 for ; Mon, 29 Jan 2018 05:43:39 +0100 (CET) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 29 Jan 2018 13:43:37 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id D132F5D8F3; Mon, 29 Jan 2018 13:43:37 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="270918217" Received: from mail-hk2apc01lp0212.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.212]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Jan 2018 13:43:37 +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=+6eBij7kJtJF8xHmgNXoBJXjYayClPXeoGqmsa76QZE=; b=ZAptiHPYK6YgtghDOAxcq5mSSfHenMOdE5lCLb3AsqLoI1dsguCVW/W5QTZjSP7eqxxyqps3uZjxRmyagFZ7xQUXzpm5S8p9w0Qiar1gBW9FJfEhLlcZ9zspdQCpHCyXw3SKoELbRRAyPVMNGyg6+AXe5G7pcwDjz5cPNFIOt8Y= 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:43:36 +0000 Message-ID: <87efm9uvha.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:43:36 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: KAWPR01CA0089.jpnprd01.prod.outlook.com (2603:1096:402:c::25) 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: 7d62cbaa-d09d-46cc-0588-08d566d2dc08 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:F8uw04F9Ry44j0CwC9EQMEpMQibo17n+BY/utEB4ObURYRUL7SrmjHufjFqSREMIxjcr6vICy9QbSdpmCvX5MzW2JqK/t1r1VqypPEeji78dS7vsEBhKX3HADWTLgneNV00bpU2E1epuAsAvGTepkV19kcCBLnrDgo9MX5Tj7HuElBQhBgF39VFQq8TB8vbqSCXqDB2pIr6gPIHfeHxiikFxr8DnOabq4/CIKKVW1ENePDis5zgUsIsj8YFN3NhK; 25:w8IM6W/g37tdITTXqAqXACrtRAESZVt0n447DrO8kxK4/6ti8h0yXksXuqLT4Tqs/AyeAsOZFJB5aNq5zWJfPjF5xrQ4olRTL7emST8YAJvm3G81Lgl0CbBB7nHFUQM+MtrEXIr94ZsjB64rBemPlc3CfD3NWpNzIYRdjfOYfA/Hp8xsna8z4bwfL6gwYF3TdRYyO/9wFI+qrs6U+DV6KQcpxbrTqc4lGUykFW9AhpgDNQMaeq3+yW1YK2pbrIWv59KpXb1K2k0mybIhyi4wbVG9812p7uJi26dhkJUs/v+5m0EgsfMz0S9P69MPrKIGP2N6FYt+iSp5RWvjn6B04g==; 31:b07wEA7Kt5gJEON7MLgsACZ/UTSr64yB+mBtUzKUd5lXtqCQgosx2qpCH/ovxfU08jFjJuRKfcVB+f+pLTfcgwm95EzkA5Qou99T1nYxSmZHNkKKBULq2bf/Aunf7eN84BU0uV2KsCmBUfmPsJPkeHevFnaZsHje5CMj5jQHL8VsqF3HkPQ+4eAa+Jd9DQTRDgtrslJdbMCbI7uokl/s6WOVS6BuBHnX9vPwGKfHkfw= X-MS-TrafficTypeDiagnostic: HK2PR0601MB1874: X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 20:bOKkBlGosWv1YEtLoa3FZmVj7FbBm4XSc5QTlhPT5Ny0xU5IyVT4Un2jO+GRDlionK6FZhSB14W2LAp6v8AA85BJ0EgiMr//pRMMLrAkM3TDtFUQHJbzBhx6QB0BtfyM1oWYDZ+St0b9VaYOhQUNn31UAz8DSujPf+K9Ti7NFqMX63q313aS+2Ifh+n+aEZMUH/3AXIg4SMMtROW5LdExKcPSPDEIGvbm1aMmAI6GR5RjTd1pTmlSwxYp7EsPcSeycdL7gyo5CINqt6JDDUQUWXr7H1y6OWX846GWD9354Dm0RDcE5SMV2HC1uCN18ma2pQ76x/YtRcZtIDlOjS24KwhsZpr474aPNgs2xLfr08zMzlizUBxthKY4U6syYd5qP55+NqmQzD7pU5yD8YNdqG0PJt5OevrTaDGp3PGU+a83GK1dG7oJXbWKyX4GaZY5OuD7ephz53e//NKqi4kpD0M/UwGrNMRFP+gKt7ePHungL7b76HnTPCIDP1q6uGO; 4:Pm2YocX4tIcf9A/RNuoqC2/hyuzNRelQNF/cKf9QLytcvAn6m/HrOKKsAO4MDvvKKCcyiRV+ERZbUIc0FN9jWFi7GRfTG0iqLFWX4BO/TGyJGuKFkyj/JE23LSeBNWmgsWu2UbVI+la3uoTVLLQ6AXWrTdblznCA86F57wwQuKKFVpiAiiFBbJigUjxfP+Dcc3huODoUQZTK1NP5FqxMPDYB2wa0N+1b2SuXYTVsMoz+RWkXbV0Hh1Bx5gNzErTD9UddLMwOMdIZxL0YCMH+Awhrlxm9uYRfLorqnk3+6FFNlEBiaak2copEVuV7SL7p 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:OcFNTuYOE/dsQn22BREHlAF1pr+7kxh7FjhLZI8?= =?us-ascii?Q?AG9xHTz1jZTtmZLqyxMprrotjgLH/8RMrDYkDD3JiCMgjiwzmeidbf/cbOlF?= =?us-ascii?Q?VJjAZirKmw2O4wTI8w6dtUNNn1JtYWob0RY4AplnTDQfzt4XmXtFcBRZ4vnF?= =?us-ascii?Q?rJlhx/bpLOjKGdO3A8sTGvh22oK1tX4fgewUTdmizMOFsFHbz2mOTCs9GGMu?= =?us-ascii?Q?g8i7gpSqC7JKZBMEEw6ZuV6VOD1gZOr2RNRg6tATWD3zEA0unh2fvKlN595T?= =?us-ascii?Q?VaSPoZJyNXG5s6vuKLAwMjo4dexZ5P2ez29Hk1Y58E42oo7GXhJ6gkUTbnsv?= =?us-ascii?Q?AkEnVvm9X2QE3uB/KQDFXcvkqOTUsV2qB64BH48RUCq0GfgmOzxmLlBU/DJN?= =?us-ascii?Q?kSKJ3UR6SltJKj5Gv4iHP/e3+HNtSYpUBgAhk3SzBJRySiIt3fHINXrUDYIk?= =?us-ascii?Q?M6RRSL3InAaUlDdCA+/0nP5GLUGIwIi/8h3AfccG+j+pUItdo5rnkRLwGzFo?= =?us-ascii?Q?I8khFEkPB94J8xdsjVpfcOKNqQcW9stV8qWErCCzjR9w0UJ10Kdt3+C5x0Q/?= =?us-ascii?Q?SirC881LOSQ+hlaqslOFNXLWC7Rdam2D1om4Ix39RWCzOFH+0uwW+skdFZAn?= =?us-ascii?Q?TWQgguPG6sWrvh2/8Bd95AcH1/sF/d9wqyu4Oue3hgG/bOxMbM/KEO8ZTYqJ?= =?us-ascii?Q?8MFcfzPQ7Yb8az19BfqetpuObEts8jx+ibUo1UxKjpeCaNz2p9rIGIXdog3e?= =?us-ascii?Q?Uf0n6n/yxdtrNc04vHx/5OUbAMbEXGZeR0SAifvnwkMy8AgUmi33ETOdn9EQ?= =?us-ascii?Q?+sik6hc0049Nt6Z7li/Q5gZ8neyPbQxRF98+2unDH3rYt6J0T0Zii8VpHbjo?= =?us-ascii?Q?UHOTPaEnnfV5Eaw+n/Sl8f3jlFr/1m7Ed+esQqodS7hUyBGJ+yVJI67XMBHA?= =?us-ascii?Q?B2dOoqSFYctCmJb1f8lHQ1I9qWmUWCVVt+6T70Zh4UNzDMYUGdrZHZG9GND3?= =?us-ascii?Q?OnimYgGG5JXdRVWG/k14/s0I+4KoEDvrnQr8SEsmb9MVUL7L6f8g2VL4ZE9U?= =?us-ascii?Q?pYN+mFBAEqVIKYE5dDBs9arV6EsjElIWIj0bIAOKye0nep0/6DQ13xkzvlkW?= =?us-ascii?Q?hK6nKXZrUh0HgyvK4viQ9zAvzcplSA8/uWO8TmmR6Bln8hcDIiJLtMi8TiEY?= =?us-ascii?Q?VkxiYbEQghs1eAmM=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 6:UsZlZSFxvZG3LtcmCHTdTswdDIfRF3xTH6I++DX5WdRKgp1jquSt/00wydWPVFrq8/Q0EoPlxqHlGZnnDE3cLnnPdcFpM9DEES4rGEk47fQMmCFqSosztfDUdSwyO1c4yHaPq84KjY2136Z4Udp0vUB7YCDAtB05gnbzbv5FFWQPbCX6nD7QLaG1R7t+9mxbW9oJvj/NYKsaB6KRjCUuovWDGJbtz5fONwt2vm65GwzByos5oZB8QWIoK+enI2if0IyeNGGJEkhnBdPHLQGlxU09E90NKy/3hDruaw7ahJadARRtFsn6oDTsKqW//1WVcQd4c2ZbivZBVx7YQ5bd6gE0Y7T2nv73R7UTaXuA0yk=; 5:lDWi/BqFyLR7H+AtqAUFFlI/ap8Kqt0bE9OYmbtDZ2W02zW3RSSLO9wFyghDUC0Z2yGOsWb/lgXZmEOUkG/0VIXXJAwUu62g6Qef4XgelPDCJ7bPw6c8lzm6W0sY2dTQ5xfpaK9jpIiIfICDsbyUIL+ZBUosJ3scanNhi6QWNgo=; 24:E7KXDrG8kaAbTXHUiWzEtySl8e1Yyc1PBdh9K37/u/NG3JQc+Jl8Zi1Ec43ZH1ShVufwbybaB/LGmqAWRoeFABs801F1FNor0FpkbqB6aXM=; 7:fel9XOUHI/HoNO9kAlW7TXXYBsCu29wfyT1on3h5iIq5lKhLAQemC4R6r2qGU785Ihaex0dAFB6EIKAwJ1NT7PIu3ufu0bPU8NvYelrwAfQoghyKgVRihr9pE9b/rc6MBSrBbJRKfPJCqLayKIF3IYOw43rPlEqz5zcfaeq7JZCq2djTZPW/aRfAuEts324WhJX+7G94V52vel1itl1QRrsXxwAlMSv0kQiz4r5aMJ168DDqjjYxD/kFq4Nyc/e9 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1874; 20:9GxbZs4if5M+BQd6xtwI6V45VHwa/V27Y3vXTxErjSoCqHzhJXbq5pVK+vO954mLjqZf1PONCQbFVWCRJZzN6Jn6JcopZGsn4NE8flZxDuF4gRCj1I++d3XnDcBNCw8ceXOIB0SyvJb0eAYO4TeomA8G7mVA/BPIsQJJ1+Kv5x8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 04:43:36.0346 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7d62cbaa-d09d-46cc-0588-08d566d2dc08 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 177/186] ASoC: jz4740: 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/jz4740.c | 50 +++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c index 6324ccd..9395b58 100644 --- a/sound/soc/codecs/jz4740.c +++ b/sound/soc/codecs/jz4740.c @@ -157,7 +157,7 @@ static const DECLARE_TLV_DB_RANGE(jz4740_mic_tlv, static int jz4740_codec_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct jz4740_codec *jz4740_codec = snd_soc_codec_get_drvdata(dai->codec); + struct jz4740_codec *jz4740_codec = snd_soc_component_get_drvdata(dai->component); uint32_t val; switch (params_rate(params)) { @@ -236,10 +236,10 @@ static void jz4740_codec_wakeup(struct regmap *regmap) regcache_sync(regmap); } -static int jz4740_codec_set_bias_level(struct snd_soc_codec *codec, +static int jz4740_codec_set_bias_level(struct snd_soc_component *component, enum snd_soc_bias_level level) { - struct jz4740_codec *jz4740_codec = snd_soc_codec_get_drvdata(codec); + struct jz4740_codec *jz4740_codec = snd_soc_component_get_drvdata(component); struct regmap *regmap = jz4740_codec->regmap; unsigned int mask; unsigned int value; @@ -257,7 +257,7 @@ static int jz4740_codec_set_bias_level(struct snd_soc_codec *codec, break; case SND_SOC_BIAS_STANDBY: /* The only way to clear the suspend flag is to reset the codec */ - if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) + if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) jz4740_codec_wakeup(regmap); mask = JZ4740_CODEC_1_VREF_DISABLE | @@ -283,9 +283,9 @@ static int jz4740_codec_set_bias_level(struct snd_soc_codec *codec, return 0; } -static int jz4740_codec_dev_probe(struct snd_soc_codec *codec) +static int jz4740_codec_dev_probe(struct snd_soc_component *component) { - struct jz4740_codec *jz4740_codec = snd_soc_codec_get_drvdata(codec); + struct jz4740_codec *jz4740_codec = snd_soc_component_get_drvdata(component); regmap_update_bits(jz4740_codec->regmap, JZ4740_REG_CODEC_1, JZ4740_CODEC_1_SW2_ENABLE, JZ4740_CODEC_1_SW2_ENABLE); @@ -293,19 +293,21 @@ static int jz4740_codec_dev_probe(struct snd_soc_codec *codec) return 0; } -static const struct snd_soc_codec_driver soc_codec_dev_jz4740_codec = { - .probe = jz4740_codec_dev_probe, - .set_bias_level = jz4740_codec_set_bias_level, - .suspend_bias_off = true, - - .component_driver = { - .controls = jz4740_codec_controls, - .num_controls = ARRAY_SIZE(jz4740_codec_controls), - .dapm_widgets = jz4740_codec_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(jz4740_codec_dapm_widgets), - .dapm_routes = jz4740_codec_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(jz4740_codec_dapm_routes), - }, +static const struct snd_soc_component_driver soc_codec_dev_jz4740_codec = { + .probe = jz4740_codec_dev_probe, + .set_bias_level = jz4740_codec_set_bias_level, + .controls = jz4740_codec_controls, + .num_controls = ARRAY_SIZE(jz4740_codec_controls), + .dapm_widgets = jz4740_codec_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(jz4740_codec_dapm_widgets), + .dapm_routes = jz4740_codec_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(jz4740_codec_dapm_routes), + .suspend_bias_off = 1, + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, + }; static const struct regmap_config jz4740_codec_regmap_config = { @@ -343,7 +345,7 @@ static int jz4740_codec_probe(struct platform_device *pdev) platform_set_drvdata(pdev, jz4740_codec); - ret = snd_soc_register_codec(&pdev->dev, + ret = devm_snd_soc_register_component(&pdev->dev, &soc_codec_dev_jz4740_codec, &jz4740_codec_dai, 1); if (ret) dev_err(&pdev->dev, "Failed to register codec\n"); @@ -351,16 +353,8 @@ static int jz4740_codec_probe(struct platform_device *pdev) return ret; } -static int jz4740_codec_remove(struct platform_device *pdev) -{ - snd_soc_unregister_codec(&pdev->dev); - - return 0; -} - static struct platform_driver jz4740_codec_driver = { .probe = jz4740_codec_probe, - .remove = jz4740_codec_remove, .driver = { .name = "jz4740-codec", },