From patchwork Fri Jan 12 01:47:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10159447 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 5CFEA601A1 for ; Fri, 12 Jan 2018 02:43:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 45059287B6 for ; Fri, 12 Jan 2018 02:43:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 396502897C; Fri, 12 Jan 2018 02:43:37 +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 41CAC287B6 for ; Fri, 12 Jan 2018 02:43:36 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 36BA5268325; Fri, 12 Jan 2018 03:37:32 +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 9DD51268307; Fri, 12 Jan 2018 03:37:28 +0100 (CET) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id D50012680EB for ; Fri, 12 Jan 2018 02:47:04 +0100 (CET) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie1.idc.renesas.com with ESMTP; 12 Jan 2018 10:47:02 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id D94AA6B822; Fri, 12 Jan 2018 10:47:02 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,346,1511794800"; d="scan'208";a="268011102" Received: from mail-pu1apc01lp0015.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.15]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-GCM-SHA384; 12 Jan 2018 10:47:02 +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=tSRuyfxN6XEj/zB+Ou+4OK+4+LTzkX77GBgh9Jvct5o=; b=LPpWetsPUnPQjjB6O21EYTXigcktqXgjwf2tHpOSAjbxfArmtnN01bAsK7RFKG0FP8KHs5SSX42an9fW7ot74OvIle0tfyl1iyyOxaQ+rHxk3+BkfYfBtrRUgclvfnmFHcEd8FS7Yno1nSUmtIsMFvWgouhMT11+j1iqoaOzAYI= 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 KL1PR0601MB1879.apcprd06.prod.outlook.com (2603:1096:802:8::15) 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:47:00 +0000 Message-ID: <87y3l36e9e.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:47:00 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: OS2PR01CA0073.jpnprd01.prod.outlook.com (2603:1096:600:2::33) To KL1PR0601MB1879.apcprd06.prod.outlook.com (2603:1096:802:8::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 84bc464b-e9ef-4f50-951c-08d5595e5fc4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020074)(4652020)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:KL1PR0601MB1879; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1879; 3:GHdlVDlxusOTrAORuioTbwhB68QIKFg/wyd75O4Oxt/LrafcRMMGoLa++ZDjErK35908uop9cdOw7/yjGgBvR11+iuhh6rt0/1CwxHH2sUqtKWGoUn76760Glh2loFA6C4+aj4CDGdv9ixFMuyfCGgjVjuVSsi3Cn9TC99fRhuUluMEVz5hckWOubmMbQyKXik+ch1u9psmSgeeozMl8YXFvOyVtm898bUqtJXy8o8MPnVHuI5ynh5Tg2hyd1hXg; 25:zXuS2+YE3TBNYan9tK3uLxAQLWKitElMeGF1xvRDvMRa4lhr6NJt9qvha/AJTd0PTRQAUXBAPLKbqnY6udWFF8uDMu9fkms78StTI1HcKLQlJQfT7kAnKl16d8n7jI8YnBFmXSuH1J4ihrNhkrnb9n9e7lo4rQAKeuwmc0Wtqt0YTDorVvHdOjEgb+wqUCU8zyo9mKIE6465E1jUJX6b89ZF5BhHsWMeqNNGMeBSp/xgVTUGLLVVnFj0oYhZAN+RvK9gcg0GXn0J7KY6PB5Mwd3Is2OLTF3fmW8YsS5Lx1rAeEkfI/tmZZMp7CpUmNFqHSBJug8i29UUJIE+GgPW0A==; 31:CBdBfFUklsrGZywKjHXp6ebGhHcmAQgyx+eoOkFfp5wMFTiDFdkF7WETyCwDu2tkcs4QSDJ0vgX1+59n7a2HWqj/tBsZG8g3Kinn1CePRvsaKcxItWEAEZNQkRJteAIHnMEOD9Fucsd1m/tL9j+6Z1WM0Xj6g2Xyli1dZJXe9AweeAlHf16HpEAPl87tHQ8PYBCDQj0GM7S+KhYew3eNaKIY876U2nsAzWgSLB84mPg= X-MS-TrafficTypeDiagnostic: KL1PR0601MB1879: X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1879; 20:LwRvkgIMVkyT4He3DKDTzOntQAw3xEPhPnSTji/0cqbydHKkXDe+2ckKETjSQ7y5y3xmYahNG648r+MqQk/82ZjrRD8Sr9rSMZnPzrDApxaw0/EWqpPWZDeOruoKQkDURYK+/eTJVhKJbI4CdLjoXyk8/JxH0M66f4S4+eD7QacJ9kpfu4PflOWEeDfyACpyvpIzl6NUY1J+AlXS7hwkCQQqc885uXC6MBeB4eaffVLZ8ii9sY/sQJ3n/IfxyaQRlw4BoeXcVed5VdWzGNTzLiZ+NDJvaY+tFXpq1Okn+6LQV1YezmHqcB68xnB5/LUzJZXrFkz+zMptH68lo+wmqcs5FM/P8YtlsE/OCV+nMKanSp6FYCA1Cvf632ZLIDoGU94XOWmGDB+UdmCe3JbeOFTlcS0vVYQy1kqoMW8kyat9hexw8d5RU79z+hsTl98aBu1cw+16a8KVbDuHq6eKOrtYs3J5Iu3GzENL2ij3fTdWuH8xjdlHKFzhncWGaKoz; 4:MkOEtxX7wHFgRWHXFGCXuaIioj5GmrnNCMSF22Uao5P2jZD7GDCcnviHjZ2Jx/tU+K+E+oFG3WLcTAf2U80+pGdH4bSMo+edRLvI0rDVSJ07bhIMlwlV6KmBhuW5rAPruYEAPcjALOc+26i9HG0A64PpeyCpfKo3vk1c7AVV8k8tWVzCkC9J4Z+6rHnLozymNSqTfmH9x3rwnz7yaE7kWzxne/hChSNwlqNlWnBEx/Pg+HVFA7gKRgipgo02WYFTw5QeERMdbOcvLcPXU/i7Bg2PxE13CQ5Dit47IABSNrRhDZ0zS1qimg7Fi2w8tghV X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(10201501046)(3231023)(944501138)(93006095)(93001095)(3002001)(6055026)(6041268)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(6072148)(201708071742011); SRVR:KL1PR0601MB1879; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:KL1PR0601MB1879; X-Forefront-PRVS: 0550778858 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39380400002)(396003)(366004)(346002)(376002)(39860400002)(199004)(189003)(7696005)(8936002)(76176011)(4326008)(8676002)(36756003)(53936002)(81156014)(69596002)(54906003)(16586007)(2906002)(16526018)(86362001)(81166006)(316002)(58126008)(68736007)(7736002)(50466002)(97736004)(52116002)(106356001)(6486002)(305945005)(83506002)(23726003)(59450400001)(6116002)(386003)(105586002)(25786009)(47776003)(478600001)(6916009)(53416004)(2950100002)(66066001)(5660300001)(3846002)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1879; 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; KL1PR0601MB1879; 23:BriJgEguP7ks2c59F2/QIYCpuDxGCA1Pd8o57ES?= =?us-ascii?Q?dEzMQIsZLT7kkve04nHOHpskzgKj2BzTILPuHCgzBSCrSODrSCh2HnLmVJqo?= =?us-ascii?Q?SDKU5f0eZr9GGa4k+EZsWiuCfmqmf/uivVR0rOkF1HXDd4aPKWXi3Nf2nCRA?= =?us-ascii?Q?kuAKr90npo8O+qlDulR7Jw1V8VBCXG2HMguKyy1Pu57DkBu4jV4z36MidRuq?= =?us-ascii?Q?6+JKgnQfLFaMPnXO6tezXwQkROI5BtbhOCNF3+/wK6m5Ip7cRBW2+95Th5yO?= =?us-ascii?Q?lI024Tkzmmj3cP1FE39qefpE4BVjqvAHObvF+rO8p7fas8/6SGCO7SFWrVQc?= =?us-ascii?Q?X/l5AMMRO4IuitpBCedlhLiKDJ0P7vwM70+2ZeN/Vh1FilFKG7vrBiuVUHDn?= =?us-ascii?Q?MpcZvGLzZat0dta7zAashJOrjlVFvlhYwQ8PsVvJqO/kygfVPXrz1nv5JIzM?= =?us-ascii?Q?YDvLMae2s7/sOD1U7+vU7qw4dLyWRzx5so+CcfiJXI4e10ETBguHoYlmF1rC?= =?us-ascii?Q?8BqxJ1Pp18gtd82nC0OvBOYhi5dTA6oM/xnmUBV6DUvdC7v1sN1VRkqgGWk+?= =?us-ascii?Q?cbRTZqkeBibQQxguYrivUjb73NJWu0KpJUUWzAqD9BAN06eN38CqX7URsKWz?= =?us-ascii?Q?Z6IIh4Z5zbK2+W4QXBWbFALMsuVp6g+Q7ml6/oc7v9tji3VO9s5HXmoXQ8Dj?= =?us-ascii?Q?jzX4zkeG94iOyHELe6DMkYpZoJL0nmHGAJw2lhMV97cKXnShW1gFEayCpc/d?= =?us-ascii?Q?HBVnlV+/kjj2BEPLr+tBZfkUNv9Z+nmp7qTaF4wUf5raUrWxImibAZLUrFou?= =?us-ascii?Q?arQUetEnGKAyqFyE9j4iGWrEFKxlaQa0NgoJ6XwWYFp6PTGHaJzxpEcSWt/+?= =?us-ascii?Q?L6O8T069LuYxzVFqepL9KpikFTeo77PeWWpZ7ExWmeCC2+p1ZT3oHQpwirGz?= =?us-ascii?Q?ishDqt5bitc43KCm8zt/Vb1mpR2DN/G+MP0VSmCwVKlV2nLSJDZzGqhPbkSL?= =?us-ascii?Q?h3K1dqoMDZ2F/jO8Fc9fhWMuz+iDY6xdxCS2SAes7UdUwunDmNCEls0hrk22?= =?us-ascii?Q?iyBwf/o8xOxulhzNCD3P0rd4nWr19ZlN9G+6ZG4lsz1M9Y++ukrGnDhMcjam?= =?us-ascii?Q?MiZbFq1OaOG9vrgtcUvLLpoVCYjIYHfAgIUNUaNmR7iyyYnl1vTAhWg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1879; 6:aQy37tLPdjI/HBuDfQ8tPNE+Tw50X/MUavEhdMchZb1heaTsHRdSj9m06DTMyYfgoS1mwjqyBSmYh2sRel/WENsPn87KJrmkGXckLgSY1jnNXyL4pEscYFcgli5RFOsF9OR8bfTaXPRmzJ9yAOqtcDdYUzcj3yIUB0MhFr2IS9WiRd6Ymm1uDmaLUMietEzv80YhVTgR866p+dK9OtCJKyeZsb1If2xHiNiKhmRE5awHmcRYRO8r1xHU9rlKiTc+5la8zsDeWqOTDt+axtMaUDkPWQi7VZLIYfjQVSJncWeh98Ze4aOkgK5DbuWteMin1dpYU4CssQOeCeGBjo6SL+qgcp4aGTJ464pw8/qMzV4=; 5:bVLunGti7TmGkuTGMrE/VR2E8m0BCjCFif6bOnvCRSkbbPJ52Q/UI7tg+aSLkelKYVSdA13q5vlEMtOQBDGpA1rbKkbwAgjSKpZgJMcJvK9/szcJ1nJwAEfBQclQVQrk5kQtDod9/xwuhoDjfe2RJRl1YugjhlJU06uoD+eaHSw=; 24:GNch1YRfek8jw9Umwiz9TSseArJ/5zjX7BQHXSxVp0FuhD+PQjzhlSI7sT5NrkgJlD2HhL/xCrivCuMSrjzBhx8b9Dntgrrx81/dBvVni4Y=; 7:eGMBSGewrNHBLcvoPGtUnxiKmF+1reNjcNB0DQhl0IS2o38xBU7RKegG2q3He6d67fulAT5QKQ+NRqujOWTVHhyEqXUdyfvSrP+v2Xp1wDN4O2PFIP/+VE0FliT95xsjZQOiNFcsicd8FKQQoyIJp0WybaXj9lSZGlz24yhKYThF5RwN8GwBOb8j3BCYgWvFKPyLbkYi3Kw2zRdSsJ3mccjlIo2tXj1PRQvzBaWe8kYtPtYJukpie+7PtIceyFtB SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1879; 20:BqexfWBZ/jskZlI2DSP9UOx8uV8L+R0Aa1/NOGJF7DCIp45rBcTgLdkpfKmRAdj0nik6Hbx2lMoOniU1h9MEXH0JDBmcIrsSGErmpK6CTrlJxDjmBkwsb+GS5hw8/abOKnfQbICW68I7BVf5LkOhnpxSy6IRhTfSq7zAAxgkoS0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2018 01:47:00.6153 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 84bc464b-e9ef-4f50-951c-08d5595e5fc4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1879 Cc: Linux-ALSA , Simon Subject: [alsa-devel] [PATCH 134/187] ASoC: ad1836: 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/ad1836.c | 68 +++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 37 deletions(-) diff --git a/sound/soc/codecs/ad1836.c b/sound/soc/codecs/ad1836.c index d0361ca..5fc8a84 100644 --- a/sound/soc/codecs/ad1836.c +++ b/sound/soc/codecs/ad1836.c @@ -164,7 +164,7 @@ static int ad1836_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { - struct ad1836_priv *ad1836 = snd_soc_codec_get_drvdata(dai->codec); + struct ad1836_priv *ad1836 = snd_soc_component_get_drvdata(dai->component); int word_len = 0; /* bit size */ @@ -228,17 +228,17 @@ static int ad1836_hw_params(struct snd_pcm_substream *substream, }; #ifdef CONFIG_PM -static int ad1836_suspend(struct snd_soc_codec *codec) +static int ad1836_suspend(struct snd_soc_component *component) { - struct ad1836_priv *ad1836 = snd_soc_codec_get_drvdata(codec); + struct ad1836_priv *ad1836 = snd_soc_component_get_drvdata(component); /* reset clock control mode */ return regmap_update_bits(ad1836->regmap, AD1836_ADC_CTRL2, AD1836_ADC_SERFMT_MASK, 0); } -static int ad1836_resume(struct snd_soc_codec *codec) +static int ad1836_resume(struct snd_soc_component *component) { - struct ad1836_priv *ad1836 = snd_soc_codec_get_drvdata(codec); + struct ad1836_priv *ad1836 = snd_soc_component_get_drvdata(component); /* restore clock control mode */ return regmap_update_bits(ad1836->regmap, AD1836_ADC_CTRL2, AD1836_ADC_SERFMT_MASK, AD1836_ADC_AUX); @@ -248,10 +248,10 @@ static int ad1836_resume(struct snd_soc_codec *codec) #define ad1836_resume NULL #endif -static int ad1836_probe(struct snd_soc_codec *codec) +static int ad1836_probe(struct snd_soc_component *component) { - struct ad1836_priv *ad1836 = snd_soc_codec_get_drvdata(codec); - struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); + struct ad1836_priv *ad1836 = snd_soc_component_get_drvdata(component); + struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); int num_dacs, num_adcs; int ret = 0; int i; @@ -277,7 +277,7 @@ static int ad1836_probe(struct snd_soc_codec *codec) if (ad1836->type == AD1836) { /* left/right diff:PGA/MUX */ regmap_write(ad1836->regmap, AD1836_ADC_CTRL3, 0x3A); - ret = snd_soc_add_codec_controls(codec, ad1836_controls, + ret = snd_soc_add_component_controls(component, ad1836_controls, ARRAY_SIZE(ad1836_controls)); if (ret) return ret; @@ -285,11 +285,11 @@ static int ad1836_probe(struct snd_soc_codec *codec) regmap_write(ad1836->regmap, AD1836_ADC_CTRL3, 0x00); } - ret = snd_soc_add_codec_controls(codec, ad183x_dac_controls, num_dacs * 2); + ret = snd_soc_add_component_controls(component, ad183x_dac_controls, num_dacs * 2); if (ret) return ret; - ret = snd_soc_add_codec_controls(codec, ad183x_adc_controls, num_adcs); + ret = snd_soc_add_component_controls(component, ad183x_adc_controls, num_adcs); if (ret) return ret; @@ -313,28 +313,29 @@ static int ad1836_probe(struct snd_soc_codec *codec) } /* power down chip */ -static int ad1836_remove(struct snd_soc_codec *codec) +static void ad1836_remove(struct snd_soc_component *component) { - struct ad1836_priv *ad1836 = snd_soc_codec_get_drvdata(codec); + struct ad1836_priv *ad1836 = snd_soc_component_get_drvdata(component); /* reset clock control mode */ - return regmap_update_bits(ad1836->regmap, AD1836_ADC_CTRL2, + regmap_update_bits(ad1836->regmap, AD1836_ADC_CTRL2, AD1836_ADC_SERFMT_MASK, 0); } -static const struct snd_soc_codec_driver soc_codec_dev_ad1836 = { - .probe = ad1836_probe, - .remove = ad1836_remove, - .suspend = ad1836_suspend, - .resume = ad1836_resume, - - .component_driver = { - .controls = ad183x_controls, - .num_controls = ARRAY_SIZE(ad183x_controls), - .dapm_widgets = ad183x_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(ad183x_dapm_widgets), - .dapm_routes = ad183x_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(ad183x_dapm_routes), - }, +static const struct snd_soc_component_driver soc_component_dev_ad1836 = { + .probe = ad1836_probe, + .remove = ad1836_remove, + .suspend = ad1836_suspend, + .resume = ad1836_resume, + .controls = ad183x_controls, + .num_controls = ARRAY_SIZE(ad183x_controls), + .dapm_widgets = ad183x_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(ad183x_dapm_widgets), + .dapm_routes = ad183x_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(ad183x_dapm_routes), + .idle_bias_on = 1, + .pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static const struct reg_default ad1836_reg_defaults[] = { @@ -382,17 +383,11 @@ static int ad1836_spi_probe(struct spi_device *spi) spi_set_drvdata(spi, ad1836); - ret = snd_soc_register_codec(&spi->dev, - &soc_codec_dev_ad1836, &ad183x_dais[ad1836->type], 1); + ret = devm_snd_soc_register_component(&spi->dev, + &soc_component_dev_ad1836, &ad183x_dais[ad1836->type], 1); return ret; } -static int ad1836_spi_remove(struct spi_device *spi) -{ - snd_soc_unregister_codec(&spi->dev); - return 0; -} - static const struct spi_device_id ad1836_ids[] = { { "ad1835", AD1835 }, { "ad1836", AD1836 }, @@ -408,7 +403,6 @@ static int ad1836_spi_remove(struct spi_device *spi) .name = "ad1836", }, .probe = ad1836_spi_probe, - .remove = ad1836_spi_remove, .id_table = ad1836_ids, };