From patchwork Mon Jan 29 04:47:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 10189251 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 812A760388 for ; Mon, 29 Jan 2018 05:09:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7310F287A4 for ; Mon, 29 Jan 2018 05:09:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 67F64287A6; Mon, 29 Jan 2018 05:09:56 +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 42CE0287A4 for ; Mon, 29 Jan 2018 05:09:55 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 073CF267B00; Mon, 29 Jan 2018 06:09:52 +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 79727267C76; Mon, 29 Jan 2018 06:09:50 +0100 (CET) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 64AFC26810A for ; Mon, 29 Jan 2018 05:47:23 +0100 (CET) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie3.idc.renesas.com with ESMTP; 29 Jan 2018 13:47:22 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 9C95D71220; Mon, 29 Jan 2018 13:47:22 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.46,429,1511794800"; d="scan'208";a="269598603" Received: from mail-pu1apc01lp0020.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.20]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 29 Jan 2018 13:47:21 +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=o+Z1iGqX0fdZdwaaLxdjsKR1uPrzOZJ0K4a/JovPmXU=; b=cmgATTB50H/j1D7xAPs+dMdPHF0SCpP9i9XrfU1kJjtz1LcVW7rxprAXfPU1/G4Z4EmM7VSLy632QIfRXhApFUA5QKrgoak7cwPHezJcvlnux3GBaMmYUIrvlf8PzvrVoilN9gQC/18SCfndFB95tbMiw25A2JkE8nKZ6+OwBuc= 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 SG2PR0601MB1885.apcprd06.prod.outlook.com (2603:1096:3:9::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:47:19 +0000 Message-ID: <874ln5uvb2.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:47:19 +0000 X-Originating-IP: [211.11.155.138] X-ClientProxiedBy: KAWPR01CA0093.jpnprd01.prod.outlook.com (2603:1096:402:c::29) To SG2PR0601MB1885.apcprd06.prod.outlook.com (2603:1096:3:9::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: f9246019-4459-49d2-5490-08d566d3617f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:SG2PR0601MB1885; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 3:nlI6xvDLQVXS1YFdMPWF3wLeXOHs8Ttm2ITsqSOohZOOYXig9GDCl0aNqAYDddeYalxhk5uBnDtzX/jojGkRPj0PmeMGeqHhD2WcAK4qSO2wAM+AYsw3nhpmZ3KNErLYbxp5pyURtAlKUEWh7PDVrBaipWkI7As9z1jNo5lRDr5KLrHu04Vn6/a7Izkb6S5yhctCa0CVecyxgbPTXlxt+zv7h1tX80ARa0Nslv2J9SCTaBbpan/Y/v4h7am50GLe; 25:BF01ePW9viHSJXDl81B5shA4LQaq1Sv9MLKKXxVUrK9nxCKtuba4XAxfMnmQwYxJPPndqAB2o1z5X9aUuZt/Wxk8hJLJrU2NspItMzHRv41CYq8pbE1VbhrDFsDXwzruNlV5TvTPlBJM1CtGLKFFSkMHwVE0VxjoOheP02UCTNwq7MvmsoCVg9tex4UPDw8Ia2oO/NHSYox3ZhmJ8nuvb61wAG8JbCZhurC/tPPI76p87Uo4ZMmOuU5PW9bN8G3/ZJtElzrzdpoktxFRYKkWVDzZJ6W+h3StSYUef9T57SI2CqelKb1neEjtBY1dHZTSi8kfr3hcboV3ATkMHOLkkA==; 31:3fnnxJOo1sNx8Y9kpq507RdRxisyt5JIHatOeQlpqZqlaT4p7D/WuhLH066kJDzYhMt+76kzOEfB/piDSrN686fAuN3nOjK63x8H+PxabpAdAPNjdQUw3UcFlLyxI3koiXlmiePwNBcxqmRTH6N4GgdQTJDiDeWlADORd1lFwLEffXbzz+ztn1WDPEhDYOhXDFJ/u6e2easdgYEQO61Lf07sX+Swnn5yliyxGB5IApg= X-MS-TrafficTypeDiagnostic: SG2PR0601MB1885: X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 20:q86c+4w2s/9JecJlC9vR5svaQ+qaO1NysGqdnQ3gorCcc1vWu949lhBKcKz+iEZLgcgdIYPV8uo/PjlRQl4cIi4J1xy4WyDqXiYaxfzOLgMT/YI0frIgaDgXye3g3IXbrdHUJMSvL0VZS8kDeWwLLaQeqkkI/BNWieWXhEX2FSks2tsnmy58PESEQtLA07TqUE4jki7R5D2CB0tjxJB+4KBqdBfWQHjbc+O2UMlLlJhM37vzr/UzFz2H7bmIvS13sWnKTnw8Z3K6pa5wt65ec4q0fnRpJZAwDzsthvln75ARo8vl95cM3A4owPUu8z241HA3RCjpw/MvJfJkuxDUbUwqQT72wHjalvvyEtmxhnTiXFJkj0Xuy4V0QribBBU+XgFwt3z6DoLDITXh7rUHevoxPBRwJ7LvLRntczGKHFvvNaun6gLYBtJMjCItHy6w93hqIUQYoafhdAPtVVSY1oCBTCIoWPq/SztV1cJR4ZN/URSNOLoqekLuwX1YEVnG; 4:yYwp3JS4sKnzcBpUHXmHQ5jNK/11FpB/ZmD/9jLqD0kOR+iU3EDsYzKkZdLYtyJDsFORTuyDVnmGI/N+bh1dTHpzSuDWISd0RiWsvSQidWbd0CXEJ/QM+m21tapehSGpVyDvBVr9bbE8aBi43HbQ21NcrTVJ9Mm4jXoX09Y7ZpI0FD/G7j9mngALl3nDwhyi1Ws9R4LD6EcB7DjGr+PYV95+AKlAjWR8cpviWFmTInGNl6Am88Iet2GjKyTUL3WYc+fGP8mKkrLRbr4JyHgCUFEBvLZKJkhFCPU9NL7CG6r3LCBl1HzNPs5tADMC9VNn 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)(10201501046)(3002001)(6055026)(6041288)(20161123558120)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011); SRVR:SG2PR0601MB1885; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1885; X-Forefront-PRVS: 0567A15835 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39380400002)(366004)(39860400002)(396003)(346002)(376002)(189003)(199004)(386003)(6916009)(105586002)(186003)(4326008)(68736007)(25786009)(47776003)(16526019)(106356001)(2950100002)(58126008)(16586007)(76176011)(36756003)(59450400001)(316002)(83506002)(3846002)(7736002)(69596002)(50466002)(52116002)(86362001)(6486002)(53936002)(7696005)(23726003)(6116002)(26005)(8936002)(81166006)(81156014)(8676002)(2906002)(5660300001)(305945005)(478600001)(53416004)(97736004)(66066001)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1885; 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; SG2PR0601MB1885; 23:oiOHCds5m2GYm6bxNHyzUk+BRhbHn84f0jk8eIC?= =?us-ascii?Q?6NfG66nifvud2w2j0z9sB7U+i+APF9/hzYYBqOB4WGh+oV3Z8u4h2ptbOFrp?= =?us-ascii?Q?dEiu+B9A0TClLjBen2cwnNXCu61D81Q2mj+oHbTUfRi7Q6FSXPmvPWRPJQHx?= =?us-ascii?Q?tPIRfcgh/U0Rk3vf26MgmCN8St4LO7duUVcuad1gy3Oja4pu3GTMZu4JkQ4a?= =?us-ascii?Q?v4RwYNrYDzIU5PuIs/IqlNbtMMvjS2NQTBtWYDCZGiVrBhIlEq4reMbDKr2A?= =?us-ascii?Q?zWZ46iIyLwKyY1N/uTwtf0oaZog8DjJo+Bm/8ZVuSekC+dm1fONUyBZjlw3n?= =?us-ascii?Q?/B4iIPKo1xTytr98eDFEAg59KV3mxaGV2oLiZl3CyS40DAmddlM0jsg3FVko?= =?us-ascii?Q?HkeQ+LZQN/oozVvueW9K09iaFl1+f7WRFjYdq6jQBdiLPQLBboGIZFsOAl4u?= =?us-ascii?Q?WUvCPxwSLysprSVD5mfse4qEVNBFiFrXg2Rdwsqp4Y2eLXu6xx5bDCMxmdLw?= =?us-ascii?Q?vAIqofhoNWRY/QMh1d28SbrSBZpCg37pIHsFT8GL+BKatqr87O2IGBBMoHxs?= =?us-ascii?Q?hVHhuAwFZoEcZ9U/7m3VY+qPu5pr8js/dY/BbwEmc8lzh/wTchOh9wZYLOT1?= =?us-ascii?Q?pxnwDdq1Q4tFcgEWq4rdyr9YdEMocMERvaM7ssFR2OP7IsxIHWAl5L/qM9Rs?= =?us-ascii?Q?3vImdgouugrPlOTxMuk+fi4F7K4maaqnwXtKkQ96TP7U+OQ/jjIx26Doxqhl?= =?us-ascii?Q?BJ6xv+ij2p9JY4yDn1fOmENa8riJb1J9byHprRR5oSBiMbUIszV1bX4ksPqY?= =?us-ascii?Q?FhZ6EC+JaBpXiKyezVixys3tubMLqT7NcXhDyEuuU1RjxcTIVmotJBsJU+tn?= =?us-ascii?Q?sXlfn/yUoALN3cLoBfwAHJaMoQYhBjppzfT4Zt6csbNofpCS8o+5uXNPTDDl?= =?us-ascii?Q?DrSf2if9A4Qr7OhZK1Ov7W2F6dVoLS3vbLn1+/1ae8VQZR48F2P6Mi7no9d7?= =?us-ascii?Q?h8d73W0J3y+VL3jrPrqdHvvapip7ShKJPRf49Un8nhPim7uvROD4PiTE7Rcf?= =?us-ascii?Q?VonozRMFQD1d6xmnsX+z9krxhYMfEf0G0LaCmXsN3NpGhRzxGmdCSLifdJ92?= =?us-ascii?Q?0OU1m7KtACsQM/d7C2+bZwZKgbtpmbY/W5dNZbBow3EwUN2KhXQweAwZFxu+?= =?us-ascii?Q?qaSECWPAkj0Si7LM=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 6:h2Y0BpoJMPZ8txL6BhA2YxPjCAKRofSXCx0MlFkiLSDtpMIDESQCxM+CLYR5UtpNjR/o6H/eWVqUQTEcczyrFOWM5zVfP8vHDxEL6tfICHz1rvndc8ysNVkuCgyVC/ANMZao2dpn798X4Hd9Uj7RnFL8iV14TqcWsNvw+jl+j5x7Wpm6IppX8pRKjHGutsGtjDYFse0eK/uuTb5VTys/Dqq03rMfMikCFtNDENbnM3MaiwLSI+3wCQQLQAlIUhlLDthVUHKcswg+4bohDozE7MUCJdcHGMzKpPe+27pYU6GX/mPYs976ZPxRez9Nls6lYSlCw+gN/0L2s8VEud7fgcnqbqGLME9yI3gwl+0nGgA=; 5:k8mYvJCV18PZlvAlK7EQUUGk3GfSuFvgEhMmME3fAS51LMutFUGdcH2FVseXg+J31jtC/bPPNIKUr1EXhlR2mzyjBWQ85HV/kLbmeyYllO2CCVUTYDR2XM1IZ1MG43copl1TpVmgcgl+UPw+wbdx844i4JJUrdS2e23Rk7SyP30=; 24:JKr0zbAtiMeVtA0AwQcBmwczjllfm17BFDymc36NRGdmqn/sEvDSiA9ykb72x2lDP6K68/A35X0lktPuiJmJlmhv04yFiv25s3F4fWilwyY=; 7:rcFekWu9icTwyQTTsHI3hM+Zd974CaLYGoXcxNzabh33RHETM20xQaXrSgqzTYQqRAUMzr8k0iP7cf4u4nPU9FQMklJT0hnK5YoMLDlx0B0eeclXJpFYQyY3zOor5dmoMKXLldrlOd+e1MVnd8JAxn74OXv043pw/1+wYcSI/nh80uto28wj9i7lhzHRjIB167mOhmcdJhbJbeITscQP5kT11/e1p5dEGKYEFmDdOdJPOpk9cPS5L3cGXSWXB4Qz SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 20:c5G0pHj2JN3Kv93C7NBAZoKjM9GzE6apM15sAvqAWm69hqmpm3UGUk6G+U9jJt60vqQvWKbKjZPUfZajmNBw3xwIE/EHivtL6aSP6KlHmJ6/outgQg+/+iG8exQlI2M30rnV+EMVB0HjVscvq0Ief/EK+RTyVHSMfoW5wpE43Ko= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2018 04:47:19.9066 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f9246019-4459-49d2-5490-08d566d3617f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1885 Cc: Linux-ALSA Subject: [alsa-devel] [PATCH v2 184/186] ASoC: uniphier: evea: 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/uniphier/evea.c | 67 +++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/sound/soc/uniphier/evea.c b/sound/soc/uniphier/evea.c index 0cc9eff..cad7e60 100644 --- a/sound/soc/uniphier/evea.c +++ b/sound/soc/uniphier/evea.c @@ -220,8 +220,8 @@ static void evea_update_switch_all(struct evea_priv *evea) static int evea_get_switch_lin(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); - struct evea_priv *evea = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); + struct evea_priv *evea = snd_soc_component_get_drvdata(component); ucontrol->value.integer.value[0] = evea->switch_lin; @@ -231,8 +231,8 @@ static int evea_get_switch_lin(struct snd_kcontrol *kcontrol, static int evea_set_switch_lin(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); - struct evea_priv *evea = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); + struct evea_priv *evea = snd_soc_component_get_drvdata(component); if (evea->switch_lin == ucontrol->value.integer.value[0]) return 0; @@ -245,8 +245,8 @@ static int evea_set_switch_lin(struct snd_kcontrol *kcontrol, static int evea_get_switch_lo(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); - struct evea_priv *evea = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); + struct evea_priv *evea = snd_soc_component_get_drvdata(component); ucontrol->value.integer.value[0] = evea->switch_lo; @@ -256,8 +256,8 @@ static int evea_get_switch_lo(struct snd_kcontrol *kcontrol, static int evea_set_switch_lo(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); - struct evea_priv *evea = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); + struct evea_priv *evea = snd_soc_component_get_drvdata(component); if (evea->switch_lo == ucontrol->value.integer.value[0]) return 0; @@ -270,8 +270,8 @@ static int evea_set_switch_lo(struct snd_kcontrol *kcontrol, static int evea_get_switch_hp(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); - struct evea_priv *evea = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); + struct evea_priv *evea = snd_soc_component_get_drvdata(component); ucontrol->value.integer.value[0] = evea->switch_hp; @@ -281,8 +281,8 @@ static int evea_get_switch_hp(struct snd_kcontrol *kcontrol, static int evea_set_switch_hp(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); - struct evea_priv *evea = snd_soc_codec_get_drvdata(codec); + struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol); + struct evea_priv *evea = snd_soc_component_get_drvdata(component); if (evea->switch_hp == ucontrol->value.integer.value[0]) return 0; @@ -301,9 +301,9 @@ static int evea_set_switch_hp(struct snd_kcontrol *kcontrol, evea_get_switch_hp, evea_set_switch_hp), }; -static int evea_codec_probe(struct snd_soc_codec *codec) +static int evea_codec_probe(struct snd_soc_component *component) { - struct evea_priv *evea = snd_soc_codec_get_drvdata(codec); + struct evea_priv *evea = snd_soc_component_get_drvdata(component); evea->switch_lin = 1; evea->switch_lo = 1; @@ -315,9 +315,9 @@ static int evea_codec_probe(struct snd_soc_codec *codec) return 0; } -static int evea_codec_suspend(struct snd_soc_codec *codec) +static int evea_codec_suspend(struct snd_soc_component *component) { - struct evea_priv *evea = snd_soc_codec_get_drvdata(codec); + struct evea_priv *evea = snd_soc_component_get_drvdata(component); evea_set_power_state_off(evea); @@ -331,9 +331,9 @@ static int evea_codec_suspend(struct snd_soc_codec *codec) return 0; } -static int evea_codec_resume(struct snd_soc_codec *codec) +static int evea_codec_resume(struct snd_soc_component *component) { - struct evea_priv *evea = snd_soc_codec_get_drvdata(codec); + struct evea_priv *evea = snd_soc_component_get_drvdata(component); int ret; ret = clk_prepare_enable(evea->clk); @@ -376,19 +376,20 @@ static int evea_codec_resume(struct snd_soc_codec *codec) return ret; } -static struct snd_soc_codec_driver soc_codec_evea = { - .probe = evea_codec_probe, - .suspend = evea_codec_suspend, - .resume = evea_codec_resume, - - .component_driver = { - .dapm_widgets = evea_widgets, - .num_dapm_widgets = ARRAY_SIZE(evea_widgets), - .dapm_routes = evea_routes, - .num_dapm_routes = ARRAY_SIZE(evea_routes), - .controls = eva_controls, - .num_controls = ARRAY_SIZE(eva_controls), - }, +static struct snd_soc_component_driver soc_codec_evea = { + .probe = evea_codec_probe, + .suspend = evea_codec_suspend, + .resume = evea_codec_resume, + .dapm_widgets = evea_widgets, + .num_dapm_widgets = ARRAY_SIZE(evea_widgets), + .dapm_routes = evea_routes, + .num_dapm_routes = ARRAY_SIZE(evea_routes), + .controls = eva_controls, + .num_controls = ARRAY_SIZE(eva_controls), + .idle_bias_on = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static struct snd_soc_dai_driver soc_dai_evea[] = { @@ -505,7 +506,7 @@ static int evea_probe(struct platform_device *pdev) platform_set_drvdata(pdev, evea); - ret = snd_soc_register_codec(&pdev->dev, &soc_codec_evea, + ret = devm_snd_soc_register_component(&pdev->dev, &soc_codec_evea, soc_dai_evea, ARRAY_SIZE(soc_dai_evea)); if (ret) goto err_out_reset_adamv; @@ -534,8 +535,6 @@ static int evea_remove(struct platform_device *pdev) { struct evea_priv *evea = platform_get_drvdata(pdev); - snd_soc_unregister_codec(&pdev->dev); - reset_control_assert(evea->rst_adamv); reset_control_assert(evea->rst_exiv); reset_control_assert(evea->rst);