From patchwork Mon Jan 29 04:08:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10189069 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 7AC8A60375 for ; Mon, 29 Jan 2018 04:36:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6768E2876D for ; Mon, 29 Jan 2018 04:36:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C41528786; Mon, 29 Jan 2018 04:36:07 +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 620D528783 for ; Mon, 29 Jan 2018 04:36:06 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 38DDD267893; Mon, 29 Jan 2018 05:25:49 +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 2DCCB267B2B; Mon, 29 Jan 2018 05:25:46 +0100 (CET) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 327FB26787B for ; Mon, 29 Jan 2018 05:08:34 +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:08:33 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 2BEBE5DCB1; Mon, 29 Jan 2018 13:08:33 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="269594258" Received: from mail-pu1apc01lp0016.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.16]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Jan 2018 13:08:32 +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=XX0ndVx6bLfuZE5e9zCHCqw5ZNRaQsGLTFtH8DbhKIA=; b=Pco5FNGIUL4/3gi4QIIyo5mts891aX+T4vm3SVvySCeB6f6IzBMLxvvhytLSLE+NgQRIllp6DrtKr+3WuZpWb6YoEXW0yML9p6fxD6asMeloWMiRxF3uuOqCXCgnTDVhJAYlhrIUBYodo/ksIu/wpR7jfw6pSlKhQuaB4TwnpYU= 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 PS1PR0601MB1884.apcprd06.prod.outlook.com (2603:1096:803:8::22) 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:08:29 +0000 Message-ID: <87k1w1z4t5.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:08:29 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: OSBPR01CA0016.jpnprd01.prod.outlook.com (2603:1096:603::28) To PS1PR0601MB1884.apcprd06.prod.outlook.com (2603:1096:803:8::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 627c143c-bb4d-47ed-f85e-08d566cdf4b5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:PS1PR0601MB1884; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1884; 3:2x9tLCk6iZL/YhY3Ul4Wf0JAP4dQLwn6GliwxQaWFbaPASG4o9v3zEnasCVPlK5ltu4szGJQBBfPt9Hff751G13kY9w2jx5CR9F4MnaNnRMp6qq7Cz0PpBVtyoE2G7UahVMC0W5mcTVUIa0sLccACWJ75dNJY26wUd9TokFp2uvDVoVboJjGTn+R5TcP/N1AxUbT85KrQ2N+U+heUMCaKhZNmcaMd+5+3+RSmqrWdnPP/EUAmADJQZndL5YQqE3J; 25:fm12NgMLNXROrMiDLqJCj92jNppGKI2NEjyrozSN3IOp5IcJ/wAMR5YV9SlwX3IxhfdlbZrbR3QO8HDwPiUhhjCgRgqyEU8sNkTg7tDlA8rnEaJNww4OdyDrmOseWK/tfynPAO1ELqCmv6O4eubqh92TWD7u7PA4I30GrcQ+VHnl0WOFglnp92g6vPS6MsYjODicEAuMeHwq0KLaG1mraUy1ZkdJqZCIvLbVGLCFTFqGqqA4LsLafq6B9+BRNHWLBpVmilL1r7tKYLLwSzjwq8767VquZnil+dPyWnzMIY2nY09czGAblnfJoCEhJ3mYrJe7NZkEGpPN+ZwILFQFCQ==; 31:PNccc59vceImIbew+tScRBVz95G5y8DpgNwhLQ5VC/JtcKQRWNvlGMu378242A6QWMJKOMUZZfKGxEq0O1MfWJ4/7DBgjOYqqT3vsoP0I9sNN6iFuMahe3mZSBGMxhZ6OEibCAZ5bOHRiaIk5f+byVc+lH2yKRTU9LSBEe60vJnlgg09DRpAPK5zOxNF77vQvtS5YmplmkOU9xGFd7sPfVkay7YFSFxu6HJ6/lnmQzw= X-MS-TrafficTypeDiagnostic: PS1PR0601MB1884: X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1884; 20:N1P0So7R9illZH4eHaMXXcqPzO34tBPH48WxU2hHmasnAJTxL+EeTmvKNAVu2gCiaSmQb3qAQEOXJX5HPhEbcnvOqUCwGiRgjOj2MINcHiEcO7mVPLT6Yb6aeR+0lSkgoFxSFE1zWF2kARCNFkNMByxlH3Eo2ab7ZGDZaAOXDQfg+URn8qUI2swxaHZmg/brWtDU74Q6KWwGCjZCAVE5pYMGneULsaHbin8q5U0zJ2aQkxbUvj1RLsCxSCYIdUeMsvVfY4E+YaCugt1SNqrRy4+W/Dc5timBLOjZmGfXFaiOsZ6NcamPRdtrU0Rrq79mz99tBCaiOKy8l1ml0VPgXnsSeIJoAglllHPxS3fAVwto/FVKoTveywp+K43fbG3vWoWYhbNppmiih+cJmYQjTJh0zuZpDZICCQQ6s1siv1GhrcgSECY6bU8rLbx7ZvV3OwN1tNxM1IOY4tr1oag2HeRjCxQideepMRivry3i2OcC4SjmSlhrdsdUlkN93Zdr; 4:jP4pTfcLfLmEtCc8PhQW3CLMogdIHaaZi6HPdK854Kfa+M1vq/kgtYvAmHHzaoS136a4PIuA1f5RbV7dvPAvPGBrkmWk7QyeVYoPSTqdNGVuenlG2Q3W9TXQzQEJ6oheJtA9VrDUby7kAx1xHqyveHs3qKYDsazJeYJnJmibv8kkCixztHY9s18rOq0dIHP2XYgYiUQWho/J00lrU57UrBggfgBD3lZvClabHW7UmhIOWsYBz7rqwUh5igU7hOyZqC4w+achVR1riDNlsgwdDRW2h+q/8qVUXTzSCXiwAWreWxRsHqzUv6mGXsa2i80v 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)(10201501046)(3002001)(3231101)(944501161)(6055026)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(6072148)(201708071742011); SRVR:PS1PR0601MB1884; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1884; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39380400002)(39860400002)(346002)(396003)(376002)(366004)(189003)(199004)(7696005)(68736007)(52116002)(53416004)(36756003)(2906002)(76176011)(16526019)(86362001)(186003)(5660300001)(6486002)(26005)(53936002)(97736004)(7736002)(16586007)(2950100002)(58126008)(8676002)(105586002)(81156014)(478600001)(305945005)(50466002)(25786009)(386003)(106356001)(81166006)(6916009)(4326008)(47776003)(8936002)(23726003)(6116002)(83506002)(3846002)(316002)(66066001)(69596002)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1884; 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; PS1PR0601MB1884; 23:bIFiSk+XQSdgzm60fr+4qy4zaNpXPIJKLyoZHMj?= =?us-ascii?Q?crgg3e0uNUWznALqISD6lnzr317tJ2D9Hif4BHr7Rxrp5F38niXkxGKDdyjt?= =?us-ascii?Q?G8z/k8+wZbrPZnuIaFtFd9HldFU+JcIJ75iHDIx/RibdZ2L6aIPI9+1g8Wfm?= =?us-ascii?Q?QCVQ7/3emrxtWfXyoOQ9sED0Q75V4dPhPSDzIg+Wl+fBx4FFxDGIScYWissS?= =?us-ascii?Q?RsARCY+jPTD6g0g2bvFVWAFhSGhr/xTrrIZQSH44t15Xc6T9yNdO412A3rXB?= =?us-ascii?Q?nxt8hbL4aUwuYStbRREpQ3hvcta29XoAXi8acyHE42/6jMWYuXugD4flKrXU?= =?us-ascii?Q?AJYrODf8E8qE/wz37z3wutoITn4Cb2yv30CxoAvbHEgfpHwip+mCPjqU2gtM?= =?us-ascii?Q?pQ0IWhgIEHv6WgzFRT/PK1iZNevjUmucPQMlCQ8XP9YaMbS09nSXtSsBKMWn?= =?us-ascii?Q?XD9yB9F4/ftfp/nIoWwvDMsGb5VFmpZqWOtBORseITsfFMnDK+mrxiFhnBgS?= =?us-ascii?Q?+GeBf0nz6K2HMi71yOymPo9/V4i9HlGJlKYO0WjK6ytaFGcGcbVn9RQAy5hH?= =?us-ascii?Q?6TGU2OQQn8wGc5Rau/5f0qW+ObHCV7z/S9Kup3Wn/XuNn1A2v1yX8MRmZYVb?= =?us-ascii?Q?Z3bgtyTsxeRVsV8d3ogumUefX3k2OHBR6gFLuIZofKWQWmYwtSUHl3Ta+9rB?= =?us-ascii?Q?8NPFK1p2BVtTXVJti1asyc5bMHmsuKq6Vi1yuaeEBigymZegK1WfaOw4eFn/?= =?us-ascii?Q?TpfPj9d+NX46E7JeECPIqvavQ6yzOOzJlVLQRsM4iqNOTxkRpZsTs6XPhcxn?= =?us-ascii?Q?y8z8aIhPRbGAkUytddqs8WPMFWt/uv9L1m9sBc4cSPcewoRVwFILV0CZU4I9?= =?us-ascii?Q?hu8Y91cJMAOMJEJc7AvOUON6OREKA8AXapLYRCxVP697Nzb5XgnaKBHlv7+Y?= =?us-ascii?Q?h7FtnNq0AZxxG7SEsjp3hvjpKavjhY9n8HFY05k3w4caxPDbaromJGb/OM6l?= =?us-ascii?Q?5EStH6rIgvqn9XkFBBUpW75HhdZ+cscch1DMVMIongKeR/JFtnxVfT9EWNtc?= =?us-ascii?Q?GtqddVChoXwZizNAReXQlVlde/9S04rZzJ1Szlvw4b1jraLQ8tm8nV6YLEd7?= =?us-ascii?Q?v/orYk20v6wWv/2TIVCkmZUlr23gXQJEusc+Shi9qQDlTWRm8u8bAZw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1884; 6:xO/65oz2tBcMdeRK3KyjFjhGirD3u6DkmMjEZ9Nt5AS9ZrJR8zOgJxap/zI9jRktLFBHibqCyhFp6/+fT1X9TnqFxFPLC0y/4jXfpiuxepnrripj4p8CS9mnyOe6AgCFHeG6D4abIVVg/yLLzx4ixDHeIGJBn5mU9mDxgBO3AV+afELFKFqBsff/fPEL6q10yXPQuxoqQRQPU+k1+iLk12US8e8RO3/eXhftcClvBuRu2zhtMA3yEf1Nc1MKcfGOxcMgbdEFiAvO06jb3ZpB6sDOBrBK5RgOpsci/TYkjtVhHicsRGcfeJqu1Cl849gSpGtHdWM9cF2FcEyX3X2HTJZIHXK67oZ/hkjJ1YOFFX8=; 5:LDgLk3niHei20Q2W5QbSUQOldSDvt+AY3+pSNbyZ9sjnhH3QaBSRnmeIAKfXIPls+JVZwUbt0QvhbkG+aEZhWqmAXUuO7poduo+s7SsmUlV7IqE/Ev1eHlkwXrD+foutE0f26IOOLuCEz14IjGmxErEcBfNCNYTJqH4AJx8iXAA=; 24:kfBfIMISGtl4i8A45dmpDlDfWQzMe0+YEUy+bEcnD11VEcOWO+501FlcPwUfO3FEQdSxMsz5z7cfykToAOGKoumkbUgnzEw/7PtcQBPYl6k=; 7:geZmuWTP1m0OMmI8rkRytqFN9KCXEmq2zB9z9kdYxsVWV+NXYHsT8hUipkIKOyDVef1+y3nYMEz8iXuEJCIID2e0oYi/PJ7h+txR1TqugR0hipHi/8e5zEODC4g0dvI3DVHz+CEmDdY7OsZHqnLfeIgdnGwxmr3obamLgXuVsJOxu1yw4EX4itMXqhKlIJ+eKkDh44mcPDRA36zEV5pNqJs5N18c1N+9Ses1bKN1/D+CJvJynIfBecm4X87eFG82 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1884; 20:flHzP2tkMIIkQ/uuIwCX3SMHC0LPy+g4+bF4Noeb+/C9b6XhUFfp6r+srikIrlspZaCzp0HDzNwUapFVRNrjsY0JYctMDVJRzrKnOVNNbWggIZ1f5CXOCPZYov4gxpPalEBye1MzE3sZ0WDaH8kRcI6DnBlO6oyBvI7LNXjKejc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 04:08:29.8782 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 627c143c-bb4d-47ed-f85e-08d566cdf4b5 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1884 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 098/186] ASoC: max98925: 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/max98925.c | 72 +++++++++++++++++++++------------------------ sound/soc/codecs/max98925.h | 2 +- 2 files changed, 35 insertions(+), 39 deletions(-) diff --git a/sound/soc/codecs/max98925.c b/sound/soc/codecs/max98925.c index 921f95f..2987773 100644 --- a/sound/soc/codecs/max98925.c +++ b/sound/soc/codecs/max98925.c @@ -99,8 +99,8 @@ static SOC_ENUM_SINGLE_DECL(max98925_boost_voltage, static int max98925_dac_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { - struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); - struct max98925_priv *max98925 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); + struct max98925_priv *max98925 = snd_soc_component_get_drvdata(component); switch (event) { case SND_SOC_DAPM_PRE_PMU: @@ -256,7 +256,7 @@ static bool max98925_readable_register(struct device *dev, unsigned int reg) }, }; -static inline int max98925_rate_value(struct snd_soc_codec *codec, +static inline int max98925_rate_value(struct snd_soc_component *component, int rate, int clock, int *value, int *n, int *m) { int ret = -EINVAL; @@ -297,11 +297,11 @@ static void max98925_set_sense_data(struct max98925_priv *max98925) static int max98925_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) { - struct snd_soc_codec *codec = codec_dai->codec; - struct max98925_priv *max98925 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = codec_dai->component; + struct max98925_priv *max98925 = snd_soc_component_get_drvdata(component); unsigned int invert = 0; - dev_dbg(codec->dev, "%s: fmt 0x%08X\n", __func__, fmt); + dev_dbg(component->dev, "%s: fmt 0x%08X\n", __func__, fmt); switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBS_CFS: /* set DAI to slave mode */ @@ -322,7 +322,7 @@ static int max98925_dai_set_fmt(struct snd_soc_dai *codec_dai, case SND_SOC_DAIFMT_CBS_CFM: case SND_SOC_DAIFMT_CBM_CFS: default: - dev_err(codec->dev, "DAI clock mode unsupported"); + dev_err(component->dev, "DAI clock mode unsupported"); return -EINVAL; } @@ -339,7 +339,7 @@ static int max98925_dai_set_fmt(struct snd_soc_dai *codec_dai, invert = M98925_DAI_BCI_MASK | M98925_DAI_WCI_MASK; break; default: - dev_err(codec->dev, "DAI invert mode unsupported"); + dev_err(component->dev, "DAI invert mode unsupported"); return -EINVAL; } @@ -352,7 +352,7 @@ static int max98925_set_clock(struct max98925_priv *max98925, struct snd_pcm_hw_params *params) { unsigned int dai_sr = 0, clock, mdll, n, m; - struct snd_soc_codec *codec = max98925->codec; + struct snd_soc_component *component = max98925->component; int rate = params_rate(params); /* BCLK/LRCLK ratio calculation */ int blr_clk_ratio = params_channels(params) * max98925->ch_size; @@ -395,12 +395,12 @@ static int max98925_set_clock(struct max98925_priv *max98925, mdll = M98925_MDLL_MULT_MCLKx8; break; default: - dev_info(max98925->codec->dev, "unsupported sysclk %d\n", + dev_info(max98925->component->dev, "unsupported sysclk %d\n", max98925->sysclk); return -EINVAL; } - if (max98925_rate_value(codec, rate, clock, &dai_sr, &n, &m)) + if (max98925_rate_value(component, rate, clock, &dai_sr, &n, &m)) return -EINVAL; /* set DAI_SR to correct LRCLK frequency */ @@ -427,8 +427,8 @@ static int max98925_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 max98925_priv *max98925 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct max98925_priv *max98925 = snd_soc_component_get_drvdata(component); switch (params_width(params)) { case 16: @@ -454,7 +454,7 @@ static int max98925_dai_hw_params(struct snd_pcm_substream *substream, __func__, params_format(params)); return -EINVAL; } - dev_dbg(codec->dev, "%s: format supported %d", + dev_dbg(component->dev, "%s: format supported %d", __func__, params_format(params)); return max98925_set_clock(max98925, params); } @@ -462,8 +462,8 @@ static int max98925_dai_hw_params(struct snd_pcm_substream *substream, static int max98925_dai_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int freq, int dir) { - struct snd_soc_codec *codec = dai->codec; - struct max98925_priv *max98925 = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = dai->component; + struct max98925_priv *max98925 = snd_soc_component_get_drvdata(component); switch (clk_id) { case 0: @@ -516,11 +516,11 @@ static int max98925_dai_set_sysclk(struct snd_soc_dai *dai, } }; -static int max98925_probe(struct snd_soc_codec *codec) +static int max98925_probe(struct snd_soc_component *component) { - struct max98925_priv *max98925 = snd_soc_codec_get_drvdata(codec); + struct max98925_priv *max98925 = snd_soc_component_get_drvdata(component); - max98925->codec = codec; + max98925->component = component; regmap_write(max98925->regmap, MAX98925_GLOBAL_ENABLE, 0x00); /* It's not the default but we need to set DAI_DLY */ regmap_write(max98925->regmap, @@ -538,16 +538,18 @@ static int max98925_probe(struct snd_soc_codec *codec) return 0; } -static const struct snd_soc_codec_driver soc_codec_dev_max98925 = { - .probe = max98925_probe, - .component_driver = { - .controls = max98925_snd_controls, - .num_controls = ARRAY_SIZE(max98925_snd_controls), - .dapm_routes = max98925_audio_map, - .num_dapm_routes = ARRAY_SIZE(max98925_audio_map), - .dapm_widgets = max98925_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(max98925_dapm_widgets), - }, +static const struct snd_soc_component_driver soc_component_dev_max98925 = { + .probe = max98925_probe, + .controls = max98925_snd_controls, + .num_controls = ARRAY_SIZE(max98925_snd_controls), + .dapm_routes = max98925_audio_map, + .num_dapm_routes = ARRAY_SIZE(max98925_audio_map), + .dapm_widgets = max98925_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(max98925_dapm_widgets), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static const struct regmap_config max98925_regmap = { @@ -612,20 +614,15 @@ static int max98925_i2c_probe(struct i2c_client *i2c, dev_info(&i2c->dev, "device version 0x%02X\n", reg); - ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_max98925, + ret = devm_snd_soc_register_component(&i2c->dev, + &soc_component_dev_max98925, max98925_dai, ARRAY_SIZE(max98925_dai)); if (ret < 0) dev_err(&i2c->dev, - "Failed to register codec: %d\n", ret); + "Failed to register component: %d\n", ret); return ret; } -static int max98925_i2c_remove(struct i2c_client *client) -{ - snd_soc_unregister_codec(&client->dev); - return 0; -} - static const struct i2c_device_id max98925_i2c_id[] = { { "max98925", 0 }, { } @@ -645,7 +642,6 @@ static int max98925_i2c_remove(struct i2c_client *client) .pm = NULL, }, .probe = max98925_i2c_probe, - .remove = max98925_i2c_remove, .id_table = max98925_i2c_id, }; diff --git a/sound/soc/codecs/max98925.h b/sound/soc/codecs/max98925.h index 3783248..96f9708 100644 --- a/sound/soc/codecs/max98925.h +++ b/sound/soc/codecs/max98925.h @@ -821,7 +821,7 @@ struct max98925_priv { struct regmap *regmap; - struct snd_soc_codec *codec; + struct snd_soc_component *component; struct max98925_pdata *pdata; unsigned int sysclk; unsigned int v_slot;