From patchwork Tue Aug 9 04:55:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9270141 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 931126082E for ; Tue, 9 Aug 2016 04:58:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DE24283F2 for ; Tue, 9 Aug 2016 04:58:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 72B9A2842B; Tue, 9 Aug 2016 04:58:18 +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 70CE1283F2 for ; Tue, 9 Aug 2016 04:58:17 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 4E06B2666D2; Tue, 9 Aug 2016 06:58:16 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id B446D2669C4; Tue, 9 Aug 2016 06:56:24 +0200 (CEST) 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 6C6B42669A9; Tue, 9 Aug 2016 06:56:23 +0200 (CEST) Received: from relmlie4.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by alsa0.perex.cz (Postfix) with ESMTP id 4CDC22665C4 for ; Tue, 9 Aug 2016 06:55:14 +0200 (CEST) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie4.idc.renesas.com with ESMTP; 09 Aug 2016 13:55:12 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 0C42560A44; Tue, 9 Aug 2016 13:55:13 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id E2E372806E; Tue, 9 Aug 2016 13:55:12 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id DDCA32806D; Tue, 9 Aug 2016 13:55:12 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id PAQ09536; Tue, 9 Aug 2016 13:55:12 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217007750" Received: from mail-hk2apc01lp0213.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.213]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 09 Aug 2016 13:55:12 +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=M4pj354oNiYeHIHbgDtDO8fn5x3VA+UfrIYmACb73QQ=; b=fB0iQqp7RZhg/+PRIjzkrP/d+VAVNw8RkzVDaKpcL2UMlXr0gZfwN/KPXtNI3Bbc/KJlt2uEvrb0tXVZBPWLt8o8/7aHQ7bczkNq/bExp4D+QtcGrNo9HxTBi85seKeKJ6ok9NUC7O6wyXuKVOy/CIj8qR6lcAZ5MbWVDtSTTh8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by SG2PR0601MB1455.apcprd06.prod.outlook.com (10.169.106.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.549.15; Tue, 9 Aug 2016 04:55:09 +0000 Message-ID: <87invaeegd.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: <87popieek9.wl%kuninori.morimoto.gx@renesas.com> References: <87popieek9.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 9 Aug 2016 04:55:09 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0084.jpnprd01.prod.outlook.com (10.167.153.172) To SG2PR0601MB1455.apcprd06.prod.outlook.com (10.169.106.21) X-MS-Office365-Filtering-Correlation-Id: 9c78fd6c-f4fe-4f51-ed6c-08d3c011573b X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1455; 2:V2AO2zgAnDTwBHAKcj5RmBp4kczyXTkxbepaLu2cU0qTQnp6slvAb496UWadJlaUtmQ4vt15FPipJeiMdD6AZr9OCwSYjji/xiI+Rmw8+Pa4W9mQVSEuB4og9q5hMRIvpTgjcJKolOsBt2+8vbGi+5Er+cz5SlvSzDLFscIjCpn0iwRQgyxxfvTYYTyhY6EH; 3:w3LOB4MXfZxnlzDEHdPYCL2CnXD0I+9tJ9F2Ra7lcxRUZ9eBXkLWRrBAYRpijUvA2Mp46DcCzCI8Pb8ROjoqSDbqGLgPQD9z7kIagYF7zzJ6BMQcullmqrrkng1ukU8z; 25:Mn6uCG1t9ZglOamx0Nkf08qfc2nzJ20GWiymLoFR2CJ7UdRQfcEmtiIZHsKU3hWVjgHOAYTWVKFzYrnwX9/KZnyJyqmqNsbXZtOgY64TCsdXzbHInuXVoHDaNEJT4mF5z+astY1QEe0cy7d6TbWRoxobrnEQQs34qASCF+zIjMDReYYbsR4+IPL1Rw6xegSyEqsCX5DCYxwLcu6GyTWsFLhZhdvYckerjBSk5bG5/qgAjRiwmwyX3n6MMt0YKgiVuxjlgQWUK8gVdu+BVCiANFJrtnx6Z4dwLW6ZmLXuwO0mqS1CKLQPKZn7CjRqi2s8Uup73g0ztbFfHAIctD6frCPhkHGiial7jiTQGrzhSsEIvZ2s4VJzgjRwR1x4wEeQc21of8O8kkUvuuPUmkNLkozS/sIiv0+pmKJmavYXD24= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1455; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1455; 31:itTUpJl5NcFHbDRJnlfhbCB/O/rcZ3UIuMvCjobyWIdA/v0qOPMdd8b7qYD/QeHK/bQNMGcOHe7i+6g/tsCq22C2c/M25vu9qAYAfegUm7c4PhX9EieqKqdWR7vheoXDhKlYgHGrF7WwBs1YoWmNXiwBjIzbtvCJ5drikHEAogJhwn60O2/gEfJJ58kKiVDR+3XEKcCnzQJNUV2gi6DFoHBqwPyA2s3bZKhfOVzQ+08=; 20:m81+eTKczRi8RTyeNR88hjxnbiyZeFttn124M3ateAbr04WqvCx+ay+2+uRmm1tDhA9wEslogG6ktSeCIvWRsfUa4M/X2gZ7HN5NVmkQfRS5gTPoe6APICRDRCLKrg5PAuIxPU9f+XMzpAZE3yBGgNfhDiIyObB0lqJa+KEZAIt40T+9Wmh07uDyf2CbAiLpiELz5xlw9+8lClY6hECHsNP7O2zJj/08hmVMuBVgWgT2MLjuyDnt+QJ0vBZbAtfASUyLAsCu1XIc3sNn9DH6v1zNxuPuIvWCE+pF7dfWjdro2AKgnWnWrSEt3Vo9fBM3uDPyeuOb9WdFtz5pBPtp95g00PdlvIsHRbGdyro2bmkhYZRB2LK6yTTLF5lV3KFYX03ckCwJLQBfjs0lN7QucmWzrrsnOMlyk5HqN6lA1aDlVxQh8U3fmFx8maeUJoLtWzxNZdL0AD5MC6k1LAD75bbY/iMNcwFbAf1D8opl5Q9x+xIfy8H9RyrmU7T4miNu X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:SG2PR0601MB1455; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1455; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1455; 4:i+YoAVumA9A1/JUcBpxPOUrh4t01ib+q2TYP12ZM9w4Hbj3S9a2bp9dn7nnyTi4lSJNcqH0en5Zy1zbFUENHAGNo/SVg1SOF+qrG1NrJ1M3n+PHkHp/57xDR8bC/MTrCxDXqFJlCTX+Z/ozG8GRpQMUMbDno0k6mJAaG10HyWMxCmZdMfl5Jx57hC8HspuiEAsdadXEafYXMnx7ctMT3W2CgsJ0CcAuyLfi7+0os+eggGHn+Jc+bFEeV8PRu/KPPCeak3argOdw10NMpZs5nUFObMm4HWCTmNxt6zBBks5D893mcS7SFJEhfQennTFYRe5j3fsHo91Q3qdb8zrf08JVZXQbxGh6snEkRk6Blm5YRRx2IxaSCdUaWB/nRF3a+svTILx0sK2tzlBuviOZ9eg== X-Forefront-PRVS: 0029F17A3F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(42186005)(83506001)(586003)(3846002)(6116002)(86362001)(7736002)(305945005)(53416004)(92566002)(2906002)(68736007)(106356001)(97736004)(189998001)(69596002)(110136002)(46406003)(54356999)(23726003)(50986999)(76176999)(8676002)(81156014)(101416001)(19580405001)(19580395003)(4001350100001)(229853001)(47776003)(105586002)(66066001)(7846002)(33646002)(36756003)(50466002)(2950100001)(77096005)(4326007)(81166006)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1455; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1455; 23:cmvhNVIgWSxamKr1hU6z3IpdpSFWTQS4yZbN/hl?= =?us-ascii?Q?JLw3ZLatkhCb3ef72QesojfGUJK3/nDYWqW4vrgce5k8fnGo43eVCFUqwzRD?= =?us-ascii?Q?SQo7odon9RFAiw/JhGtPwbRXjxhnltX+r6UwQIbx+IyYGm+Jbaf3MQlmcybz?= =?us-ascii?Q?fHc6p8Vw3X/4xEJqEYfKmRcPG+ICC7Dbpulcx6OOonsreu5vrEWZIey+RC8x?= =?us-ascii?Q?gf2CCkjM7oKc0gFn8TTijI+CURvqrKKE8MWCFOM1OP1+Ko3Gdw/GBCYikQAQ?= =?us-ascii?Q?eFwQhqM/CR/C/i5iS07x4R0Sz/5IQw5irNmNTAQR6SzZkzp7Pm+Jfa4v4AV9?= =?us-ascii?Q?IRv9eENcH9ZVNo3c6bE8expkbIhLMl9j6126RVouR2C6ssUrXzPmSuNwveXX?= =?us-ascii?Q?jFey1SJi6IdqnAyc/Yd9yL3JldciTmltGB0xSU30t6XKJIKCPcvZ71lZuCgx?= =?us-ascii?Q?l5qi183A/2K6sCoFXE0Tm6/b2g0PVhRWXA4kWISsMwM3DnguLt84uYaBvjyL?= =?us-ascii?Q?42P9Q42Y57yDcTbpt68bYjoANP7TEJSXcUUyhb+h2f9li/Scq/oUEkdGzIUF?= =?us-ascii?Q?LmYjGTjZqFKtQBhr18iL9jxvJ6eE55tZDAB4ZBTm5Cx41JO2Vnvyn9zGQmAq?= =?us-ascii?Q?MsW49bIVXJGermiUubqM0t/MsszbbxPLxy+VeUbQVgpbDXixz0qgSYcoMOV7?= =?us-ascii?Q?SOy6Za+KxI+ClSVDHbzbCI3L2y5ErBEFqaEsxUKcgMJeeeSqWfGSpGVeJ5WD?= =?us-ascii?Q?qW6i+kg+oHAEfuLG8Gw9BG/iw7R/pSb5MVmgxbfVCgg0Zfq+GwV/pH1eeVwW?= =?us-ascii?Q?LHFgUNbnCmEXyZv2ZuFgCxXpN9nXfpTV3Dns47T2tSdgtuTwqbec8MDDsqZj?= =?us-ascii?Q?NZ3lckvzQ91xZbSnD/OMRbhd72L4vxvQgRO3WQaUQKmlh8C4EZ2R01dQ1Ayh?= =?us-ascii?Q?a2NFErjTLScPIST36/03FQAT0en/bmu3lr0Q5DiK3f5vt36gNBOrB2ITledC?= =?us-ascii?Q?na/BEjCL39JEioJvI2bPw/PVis0BtkAnpFzTp7f0YITYCbsGkDczw79f/uG2?= =?us-ascii?Q?ej9kY+sVJ4K32S1Iu6ijoC5GHxwI6W6fTIOROR7Gbtn2e5M4TeP2lxpoGCX7?= =?us-ascii?Q?JJPXAk5gkscGCSV6z11OfRtD20E9fXymJLvSzIg5zFPEwPZjcdCefkA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1455; 6:2hoHuxUDcSqAJZYz/S5VV3Ewbrpl54Y1yX/lNtrPYDT3TlfI0P7Y5jkBY9xbTCYoiAwJOk3MIA31DOPV0yxX604lszCLal0SNyePZwtnl+1SRLYlhAbJmQqB3cfy4DbsTX6Ugj0jZhnFDfHhJlUyNt+zf4VLSuNEdGDke+wgo9NQUu8p2IoZl5Xonp0bUlvil9xr8ih76bXpxvsZ/nX3tWXPtFY1bM4b6Nkh2JYkLJwA4ODZkStUZMRFVeNOUE0AHztdwo3aCVMeUZOHrc66GqkJA3OWSGNUvBhKQcGTuxZ1gzPaMPmW/bZ1fZQHk7JoLCYlMHEHZl49pj8Uen9t5w==; 5:prF7Fy2k4cDyhcn3PMRpf9boMNTxmqQcyM4pbW2njjihVdx6XWXvUwYscBmVjaxGRPeQGJjfJGdhQSetxUiHu1WAdKcZKCZIFPot5RbcIBDZ/U6odbiknOS+oP+U0otBZmILIcKYL06VhW69HWdqRw==; 24:/vJwJugBcw6TlXliA2bRLHW7Tw3CUrLy/KD2NK7Z7loA5wlh4oRK7zje2pc3q6j2tgopMgslQIHYlh2mw9ID4jU3O+joXHtsF3JvaVGN7y0=; 7:Cq1O8jAwTF620Ck0us5qIdVluNY4JbeaOHZ6BawRe/3gGuslDDvqTtCZ/+mDgAWl3a6Jec3B0FCcgx+HVbkulJSBd5NA7CmaNnhcHIHRQHxZ7wXZUotIOBQtrH2h6B3ZzhT9yHAxBk3KkqV73KCU1A2F3eG+7XJeIWQCReCPEen7NAEo0hdbqR8JKP1uaUULMa+L1Jg5Usj7OsULAfBDtNvXCgRlXiOxLbszfSEnRKRjHA7GvTBXuWA7XGXXWiPs SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1455; 20:KsZIKpYPHfEv5Ei41ZrFN8NRrxgsDkXjxuHa8qh7oCd2uUqf4nxS8p39/PORew2mpdZr3GMDzi/1mxgIT7PJyTUQnTaJhxYVKWVgfb3ECNRR2LOUfXeT5N2HoIKHYwFYsjG62xBvzCoJWHko2CP/flqFFGu2RZ03mX7mLmfg9+Y= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2016 04:55:09.5130 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1455 Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 005/127] ASoC: use component probe/remove on wm8974 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 codec driver and component driver has duplicated .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/wm8974.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c index fbda6e3..3da4e44 100644 --- a/sound/soc/codecs/wm8974.c +++ b/sound/soc/codecs/wm8974.c @@ -663,8 +663,9 @@ static const struct regmap_config wm8974_regmap = { .cache_type = REGCACHE_FLAT, }; -static int wm8974_probe(struct snd_soc_codec *codec) +static int wm8974_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); int ret = 0; ret = wm8974_reset(codec); @@ -677,11 +678,11 @@ static int wm8974_probe(struct snd_soc_codec *codec) } static struct snd_soc_codec_driver soc_codec_dev_wm8974 = { - .probe = wm8974_probe, .set_bias_level = wm8974_set_bias_level, .suspend_bias_off = true, .component_driver = { + .probe = wm8974_probe, .controls = wm8974_snd_controls, .num_controls = ARRAY_SIZE(wm8974_snd_controls), .dapm_widgets = wm8974_dapm_widgets,