From patchwork Tue Aug 9 04:58:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9270157 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 2D9EA6082E for ; Tue, 9 Aug 2016 05:04:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E56B283FF for ; Tue, 9 Aug 2016 05:04:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 123CF28466; Tue, 9 Aug 2016 05:04: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 1BD7E283FF for ; Tue, 9 Aug 2016 05:04:55 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 5806E266B4C; Tue, 9 Aug 2016 07:04:54 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id BE985266A5F; Tue, 9 Aug 2016 07:00:37 +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 DBB2B266B5A; Tue, 9 Aug 2016 07:00:35 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 01286266608 for ; Tue, 9 Aug 2016 06:58:16 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 09 Aug 2016 13:58:15 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id A3CFE46E5B; Tue, 9 Aug 2016 13:58:15 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 834352806F; Tue, 9 Aug 2016 13:58:15 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 7CE192806D; Tue, 9 Aug 2016 13:58:15 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id PAH10560; Tue, 9 Aug 2016 13:58:15 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217007980" Received: from mail-sg2apc01lp0239.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.239]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 09 Aug 2016 13:58:14 +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=W84R9cRBPglFDgWOpX0VUEFAtSWkzAeJKfUxDRXzqwo=; b=jMWk4YVa+YFrtKn9dV92702NzTbX9BBh3esmBm5KGBDy9i+P2s05CsimYm8qKVEqGecLkWO1zgmsQ7xAgwrE27KZgELdZT3nn6mqxuhkHqbA1NPSFGFyKAEqpUl3lJ6qHF+DsTq9PTKyO2kWL2HoyCnUdjHC+P64D3S0r49INZE= 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 PS1PR0601MB1449.apcprd06.prod.outlook.com (10.165.210.153) 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:58:10 +0000 Message-ID: <878tw6eeba.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:58:10 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0051.jpnprd01.prod.outlook.com (10.165.51.139) To PS1PR0601MB1449.apcprd06.prod.outlook.com (10.165.210.153) X-MS-Office365-Filtering-Correlation-Id: e9f7b968-91eb-4b3c-2fc9-08d3c011c30c X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 2:0V2CNSdqpla3BicAQRMaOIpW0t33gzOmJKceFPtKLHcR2s4+3mdV4EHyftFztb1a8xC8UzSpajZSRrFrtLrkVlSi8wcN5s/k0znAFzsRc0ddNBhKbvPq07L7hhLuNhWJBBbE4X8AyqRa7ps77eMN/JSknfnhT8Fk4PW1lfhhucPA5kWd7rxiRDkzspfbMRg3; 3:5FPKz648qH2euR8NNwkxUcQWMGB8jFu+IPeNJ14sm7JXrqhVHpYvg6baenGP7gOtE/h7oS67EleiOJzubPrKkEgY7mFWBI63oXkGoIoCUFpCEMCdsw4N0nCsoF/y2YqU; 25:9ngOm+I9ppHF7fGMCrqW++VhjcKIKPaCHmbvQtCUtkNp4VGopci1sbby7W1yHcnXnt7J0OxFquYAhULi1ifCUHoCQpTM5TGvMaPR9vrYhJEqDIUjwOwnGFIrxNCGighEJO9AN8ClGpcyrwWVsitmjzgkzndJHPBU4Q0nYdVIdYZjPk2bDZ5Bli5D35PZtJgnGp0KJbW+c9ziZ5WZfm8d0CJSfJAR1P8Amp999kOWQzTfbGYj8bEXmZQ5RyhFQnbtw5jKsi8pgWnOfrxefgMA5Vk8raJXRmuIEygOuMYwb2Mw5DE38HztsIBGOwMi3PJYGQoiENqDF9oPMW0We3U0v2SdY/5YverAMZ7gYFDFVvfxeKLu8jhlgaO5FOp8lPhphQz35TL/sPcfuzRppRDRADKUV+QgkRb9FG7dUrdzHEM= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1449; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 31:rRAurevxS7AKlsyisVyu0tc73izDgrR6436Ir663f6VZD6L9lrLBgJrQkRQHnuz8V8SS+xOOHQX0VB1LoeOvX1klg/lCWAVztoHgtPDZ/59RPHtN2YSYoUTrkohlJl3Rc+REi6t3IeSPuGsUvwTMxGYDj2uR2xlJ5c35VtbJtCcByPx58cHs9b5rRZ/sHetyfUsh+h1/y/FniAMhlK1EUts6MjJ5r9i1aMcl5cn/NdY=; 20:e6I1tFwbcgX+Vg50Oj6Dqp+vZ73zJ7E9Pjr9RLhwH+UoYGg01pW2UwUr0Oj5+ueyQCI3wiEcnsiTIoPlvpHjPuL/f3yEYlFwThQFlsVT51D3jjdfMjj2VRHX2wTa58Bu4VTH9d1Ru0EwS/6XC+rJ6mObWXid4vl4UeKOTyJk7lIiRuFgU7Hn9dTGy/0KLTRByDnou3YAdcbVWvOjOk4jeIwVC9XP/vAZAEWS1c1mC/g4/GG1QkYKkwynZlIjzk958ZhZ4giZqLox1cp5BX5cvhSZLTXxSdk2l0qpSjWp0+O5ZAUVPipzrFli/bJ+ZGQVono6uT11yzQdtZvMk5+hPcIWEW2UPGEJC1gc5il+FGotTiErHz0sAS/LHljmbhiDHekF5CWy5S7YPD2oLiLgtbWiWRdiubFV+GDtn7/HQxE4vBsy+uI5ZwBNBTgZb7q7QE8ENPwKxcMzIAIr9ldDMQbnc0x4vfK1ZLOS8lf/Ujup3o9KvHmjF2IhUi08c9x6 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:PS1PR0601MB1449; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1449; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 4:9I/fAY8EI+4lldEFftLdi8TB3poAJY7S3bBMcc/bpidczrNu3yksu4iNHiR2SDiAQEOLlpVrxuqIGpM5DVdzgnui6LqqC2OhyGgYMsbSzV1JJbq9QT0A9S5Q6nU/KtaCHkSwpM4USVSdOWNNmIZ4I9EPX4BeXpE6bod47T+OUS5/b4iSJsga+DOfL9FlTDN4yCDuCdV0WgfTlo+/pSTY9qCmGTAD7hhCsm+i3eB5dQWM+oRGRKuGLPAPefQO9zZ4AEzBp8SxGo2C3W1q3yDwGV3x72SNbGrYw0nmLs4oMpkS5Fd51KZMtIK0xBGA8K3BZTRvFqHOAhwx39rAjdLMFOtVtO+IhjjKqL0eUDTTqjeruDBTGTD7eEYrO2ILv9U54WWvTmVolpeihav/VnLZCA== X-Forefront-PRVS: 0029F17A3F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(2950100001)(92566002)(229853001)(7736002)(4326007)(46406003)(76176999)(6116002)(50986999)(586003)(86362001)(50466002)(106356001)(36756003)(189998001)(2906002)(23726003)(7846002)(54356999)(305945005)(8676002)(53416004)(33646002)(3846002)(66066001)(81166006)(110136002)(97736004)(83506001)(47776003)(68736007)(81156014)(4001350100001)(101416001)(69596002)(77096005)(19580395003)(105586002)(19580405001)(42186005)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1449; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1449; 23:PuKYAaoUY1nlmhPokkzhEoDSJ7mSnDe8443YXtO?= =?us-ascii?Q?YgacUzBU5dLJefbvQDFnvgIkCaPt7lmYARFamI+9hTHg3Sqx7qOk8Dzco6Ba?= =?us-ascii?Q?R267eso0735TfZQ/gECsRjsYTtGbTlYbfqJtj9B2sKnQFEaB4LN1oc4amAWM?= =?us-ascii?Q?tVKV4GnzZppqkZLB27js4H7fBkENcO1fzY2QrYyvZ6+WCIRCw5kmsBAJNgnU?= =?us-ascii?Q?eDO3PkrX8XlAPkzR5tviMPwad2AdlLhDK+5lTWI/5PCLxAefnl5a5Rk+65uK?= =?us-ascii?Q?k277yUgs3EvmsvPapLaOQOJQbiu6yM2rZ+6cOBxl3ZiDJhfGq8dqy0cJZaaz?= =?us-ascii?Q?uFTDn3FiSbZUKYViEjPrCtZQE8kCPKKgqP2deGgbCSM9kQWwNCiX/uEJL3VL?= =?us-ascii?Q?Y1XFSt/hGBTZkabF2IBnBdF5ZL3tzsMHKdW4NMxfy+tCM1TweRirKmLnd7Au?= =?us-ascii?Q?f6CbhuHk8WKjp5NMd8r4u8VhKqZZtHDdeMMGt2TUi3HF/JSrnCLitp4edoR3?= =?us-ascii?Q?qu3T5gWonKdcZblumQNe6vs/Xnvhnq0SxZmP+PKg4WqyF+jgq9r6GvlV+mPT?= =?us-ascii?Q?0JrSzaveVjonhw4JbqFmWZnUWUecwOQ/82Y+gjPKB98dpKjyadUvb9A0yO9w?= =?us-ascii?Q?JlQJF6D+SmfwwoYlrU6JyspwvjgRgRo4Oex9EUE+hhReBwl1ef1Qtu7F8H35?= =?us-ascii?Q?nXb+gAz9EcFHtyXkLc3APJc1MMILihgF0VlGegcoPDd+T/Y03ZSs+b6pG8xN?= =?us-ascii?Q?mDp54W55wncr/hBsbxFgjUMRKAKoR6C38mGoa+41ir+ymcjRHQrKzh5Lt0y2?= =?us-ascii?Q?dGmo+c56Rbc6ThyjSQ4P43K7g9IA5GMrZLewldXQsHtlcNpTlg6mw7zgoc9S?= =?us-ascii?Q?OXZRARKEYEKzhN2FAxosMjvJKoCkOXA69ecQUzYSxPbKZOZ9aT/l/Zi8tGEg?= =?us-ascii?Q?+jRxSaJwFu6iGkX8trAf+6uVbAAAbzuuknVNVamuaKy6296eHsFmSpqA26kp?= =?us-ascii?Q?H5x5b0yUwDxk+ea53Kxi4jzmRQ7qEyJ92yI+cQ6DdcNG2HlM3XlRy3rrAfy0?= =?us-ascii?Q?uaZFdMf67FbY3egmIIy+Xj3xawCKpH0HECKqdJM6Tqq2hmP0USsrfeiQ2Ux0?= =?us-ascii?Q?Q9nyC8R7EbHiJ99RFtubVO9Qr3VXz2jpcfM4ppAau9TMhlB16uEaM1A=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 6:zWBJLoCre/f5Sy5s/e79CkP8CNoL/+P7qRE4CsTbiyKJ7hpB89CDFrd33lqkxo6uO4Kes1JwCARUJ0F/6nNnlUsnbWADQYlR+OEhtZeRdbc7h9tLjA+PNFTmZMhcslqajx9oYdYT9Rswvr8S1RgMdOKuaCrY8oeiFrPumQhbDicW6nLqcnR6nNtrLVp5Wy/ELJUDrkJq+ob3yb+ENUtIi+83ORzvsILKOZh3B5wAN8qsINhbzah6C4kXHf3V3GZ+2AyCcf4pYJJnyrq/OAAzfPMLpa5vRUiy+MfaPczDdKPZ8LzdAn6aaYZ7tBuXFqb6rRNI759e1VWztClXJDvm0w==; 5:AOhYF68+M61HWsBOXwDuBsVWpUTm6vU/gtbf5FSZIj7omsnYuzvP+B0u1+RSnIMIyThrftYfueDJ9qEj1qNPXW2ZZYujJcE+VIwJKKrB2lYDsju+Wtx+szYVbn5YETdoGetQjHsVDAXib7wquxIm4Q==; 24:nEK/W+jqrRViPke3TYDdpKlPyrmR2Gp+5qcBO4FflXFvnIc2AAW7GeKhHIUXbNwF+EsTnJMQSPdyWtaa+hD4AeQz1zufOcRGxb3OxCfT31g=; 7:W8VkJ+3dKcQiXG+Tly5VkyqB8s6aW0MrbmBT3R/kf+Fs+TGin3ok/HbGMit9TGGiska5hdhEjpYQwa0tEGLPDcpo5Mg//kZFQg6FEphdGCBgv3a2KCQ+YGbXDy92mHzAwzuo31KuBHSwgHZoNBBPVAipt2rUvhB8nyZLMy8P0dCdc1BuEyWhCLQG00YFzL+PRDpVBXkMFo3D+Kw3rH8DWPU58zTxeGpjODfVHIIIWG1nqloDRIhirGCXbEimQzR8 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 20:TlOwuKzHjjXp84aGFRp4QPEg14//PvKu667e1upoA3Sl8SdnjMUkFNJCRnfmnHsVgPv395eo7dbnGSpT3aT1RioL8gAzxsNcPk0oytl4Y3lcrtDo57HOJ142zpdodNsmM6d04n/2cRnior1rUjp1GqRVqQyAsTMB276nH63z2MA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2016 04:58:10.4701 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1449 Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 012/127] ASoC: use component probe/remove on wm8741 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/wm8741.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c index 3e43272..381a3fb 100644 --- a/sound/soc/codecs/wm8741.c +++ b/sound/soc/codecs/wm8741.c @@ -449,8 +449,9 @@ static int wm8741_add_controls(struct snd_soc_codec *codec) return 0; } -static int wm8741_probe(struct snd_soc_codec *codec) +static int wm8741_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8741_priv *wm8741 = snd_soc_codec_get_drvdata(codec); int ret = 0; @@ -488,21 +489,20 @@ err_get: return ret; } -static int wm8741_remove(struct snd_soc_codec *codec) +static void wm8741_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8741_priv *wm8741 = snd_soc_codec_get_drvdata(codec); regulator_bulk_disable(ARRAY_SIZE(wm8741->supplies), wm8741->supplies); - - return 0; } static struct snd_soc_codec_driver soc_codec_dev_wm8741 = { - .probe = wm8741_probe, - .remove = wm8741_remove, .resume = wm8741_resume, .component_driver = { + .probe = wm8741_probe, + .remove = wm8741_remove, .dapm_widgets = wm8741_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(wm8741_dapm_widgets), .dapm_routes = wm8741_dapm_routes,