From patchwork Tue Aug 9 04:59:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9270163 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 8D79060754 for ; Tue, 9 Aug 2016 05:07:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B77A283F8 for ; Tue, 9 Aug 2016 05:07:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E2F22845C; Tue, 9 Aug 2016 05:07: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 5B7C5283F8 for ; Tue, 9 Aug 2016 05:07:17 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 8F0CF2669E5; Tue, 9 Aug 2016 07:07:16 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 71220266B9D; Tue, 9 Aug 2016 07:01:57 +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 D30FE266BCF; Tue, 9 Aug 2016 07:01:56 +0200 (CEST) Received: from relmlie4.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by alsa0.perex.cz (Postfix) with ESMTP id EEB9B266641 for ; Tue, 9 Aug 2016 06:59:22 +0200 (CEST) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie4.idc.renesas.com with ESMTP; 09 Aug 2016 13:59:21 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id A607C5E8AD; Tue, 9 Aug 2016 13:59:21 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 76916480A4; Tue, 9 Aug 2016 13:59:21 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 648E848014; Tue, 9 Aug 2016 13:59:21 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id PAA27161; Tue, 9 Aug 2016 13:59:21 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="217519209" Received: from mail-hk2apc01lp0216.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.216]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 09 Aug 2016 13:59:20 +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=x5pq5zneWEgtxNqReOHugf793ACMcPzTVj6x2omL3D8=; b=KRUrHjkdCQDNIqbje61TlYaNQtHXNenaEENrFH1JirbzkcGHdac6Q/bDAF/hLMisfIMUqxCH9OKNJvG26YSLa43SrEZcFVw+UJNIfSoI5fmBC1d9Yr4Bu30ftuvFUNU6AUO4jp07aQib1CcGI9eEp2xk2VjzE7mjmJ+MvSfigXc= 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 KL1PR0601MB1448.apcprd06.prod.outlook.com (10.169.69.26) 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:59:18 +0000 Message-ID: <874m6uee9g.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:59:18 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TYXPR0101CA0042.jpnprd01.prod.outlook.com (10.168.40.180) To KL1PR0601MB1448.apcprd06.prod.outlook.com (10.169.69.26) X-MS-Office365-Filtering-Correlation-Id: 2b8b4133-1826-4ca6-3522-08d3c011eba2 X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 2:AHynLO109wYKXxLMqU79Fqnrpns3kEYdrWCt8GgV/OzZaQ+9y+dV06JXXizl8b+TsDKVJwPWi3XwcCsK3V2rFQZeru9i0C4k9g6F/YHucksAEoE31609pOr9yG5GV0cwf7NIyJMqH3UzesXnUCcp4kKKlYOhLhoZz06P4gVbACYd/RuvG024iwzTD7YX1lDW; 3:r4Y+pP4M5ksD58/2w/XkH1jmegm0iat+HVLN62/nADRMxVXbzWx1vhvjhEeUToqoQcQyy/1Z3J1JUrPlMrkNFzsS6hiBdPAvVTDdifVC1uPyJLoWbcHhnzuX3e5tv0fg X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:KL1PR0601MB1448; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 25:2laqaXCi5Hl3ErIJnhPgsp2oplvm8l21FvclFlEJrINgBWQI6dqv5CdjOtAfrh98w12WVEIKCXKixUCTcd8g0sVt0mJoDmZZORyKDsxBLkdgtBekABBAQG9V0FazEWVvmV0bM/A9YpyrcS+/B+qFN7E6vJwl9sA83lyDKt8hiMTnHDXK+KPwuAczxiYiNOJ/QI2n3HoED3pWT0aeV3wW8lBZk8/TiDylKvjW6+8sV9vy2g4qGD11fOj54clR5ic1E0QTJ6z3VlDzMsmK49OVWqzW2AXVhmdh4vnN/cEZUBwyeg4l9wnS/YLjM55mb9vXv4RrLRcx0VylbTNgEQwynj8Nf9IwZZnYj2Fn1RVskSd1icFiHbpf4ffYn+epnt6Kzp5unhcqujxeiUyGBlUoCOxjwEhM/CeG7zEiPJvZaRrDzrsmNkwMEhNCGVPipyqfp5vgX7OogeLU5tI/6AOMRKcKwMmALsegSE5V0OnSw5SkgrXqtQQI/cEuoUCz+qK38pfZSpWd62IrNztdEOm6aq/CTdi+qNvc9ny2V//C206MYoW5lVqixiycDvOtYlBCo8+EDremLLiazWYzblY0VQN3s52ybYbBBD+6hhebm84C7fc8oL0AsLtGOYmUNZlb7FwhEdlX1zNKhmseEyrMEm0DSObyqxdK5dh4EVBqXvNVgnyf7kTbHe2u0WC46kI6lp11bPFxamTzIS22bacccQ==; 31:h4fiw0qSGjtZkUbXcq42Uy3UqWm4+vK3y3/2XJSjSOmSOTIxuLhltvtYJCG7fiyLHOhhGrzFIy7AmWcF8wUX5QVYuE6+EJwiDL6w6rzVLvVCb8DLEXNb0d9nTywf8wfD8Ilu/dBJ2RfHkqJNN+7Kd/B4PRj2fVtMWa0hiCBD2eR3UBsjTCTwpicBbJ5zBLz2Y/qN7aI+F8zTQHiGCsERdQLGLOhlKbc41D9KhB5lIOY= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 20:fnxKl/JyF0zM4AhqPL/EU1sGFKAF0rsB6qOj3UnGusYYv/3w1GDvuYwkT+cYKjXXxEBMiOwqdIQnQIdbL8k4FsxeyG10fPOq7Sh6lutPcDcj83+8j53uAfX1KAcJRc/eAc5Ze3FXXNULFeHHKlARtCmFkJ9uGLuTtGO1lzZ+xjNJyErwoaKQvyK91dOxJkSR3Hr02uaomsxBrejzBiDJwhM1u+Z1cXH7sw6dOqjIb01GGQS8xGJD+S9xhJqAI1KRHACwZGRuz3NdP6sPRHABkud7v2kqXf4mJQU+ryQroO1bcAlPPMx8clcykkMvftfAmyE+5W9Tra+VOYuXEX1aZhMijmpn4pESp8ghESPVbQvI8JWBRzF1UoOBGoH5JiQoIooS3r5KYXnXlqqpuEFL+fXDCaiGb21doQmp999IRNhSMzGL8OLJ+rf5kg0TB3Ka4XV/71zfnI08eeTUSOoe/7o5gS9BTBMuYocv6l07HkpQG5Y2FrnuO/Yemg6U85qv; 4:DlwOv9bsNubbika7+SGDpIC6QeJYjTeMAO+hFcgK+DAfzh184WHOQVWG1ulP1k0h/C8ephzXlsZ27WeO9wnaAtSwAV8buxhgiRqzIt4eXwKqJ2DJC9JPqeNmN1/PGqYD/Yn6LjWlhUDRQfSy1f3jLdZ8e5qKX6A+kZORk+MOIERlY0Qnhax8KQy3ZMghn5IN+B4tadEFplBtKqpueibERfIPUlsVZkOkoXhi+omSvYSYnPaooLlVNfSoxfe5aT1M6OCuuMnEEDizvVzDi0+X5XT9rGPnBCe/qM59zOcI6/AjzmZuvS/GhbV+R+PVFxplnOxff77mfoRDUIrymYFsHrL6FkrrxrJx9tKJekwS3Mj6165eL5YGdBYar9eCBe9uik1dBtRcMIz1tRslZpglfw== 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:KL1PR0601MB1448; BCL:0; PCL:0; RULEID:; SRVR:KL1PR0601MB1448; X-Forefront-PRVS: 0029F17A3F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(53416004)(106356001)(97736004)(101416001)(42186005)(3846002)(46406003)(68736007)(189998001)(50986999)(6116002)(36756003)(23726003)(110136002)(4326007)(54356999)(92566002)(76176999)(4001350100001)(66066001)(86362001)(81166006)(105586002)(586003)(81156014)(8676002)(77096005)(229853001)(50466002)(33646002)(19580405001)(47776003)(2950100001)(7736002)(19580395003)(83506001)(7846002)(305945005)(2906002)(69596002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1448; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; KL1PR0601MB1448; 23:D9M/zrOE0i1NA5OKmxNQ5qsVAA5kykvaX7sDJoB?= =?us-ascii?Q?NMsYB1/DeuQsdPGTGwWILAbS17mzAvTmqRfSoG3qU7aA5vv4FMBZugiQ661+?= =?us-ascii?Q?zCkKYJ5kavNajc+/cvPmPUSy4QSgAYvfm7PNqzPMeksvG/cbbpYhbfRGQ3Y6?= =?us-ascii?Q?+0lcMm+AsObs5OGjls2LVym3g5m1ToXgWecpx/QIY4X8fPinCvmZESX3HrDY?= =?us-ascii?Q?bakHZrVsvyB+HbwwA8K27SeJUxYjTVHVAcY6aTmu70JAZQmV9ItNd9Rop9Un?= =?us-ascii?Q?DgOX5pYh1odsoP1vQc/ACyLBU7T7YuB936vCdVod8fBTwzhVjbMgMKeVaNxz?= =?us-ascii?Q?ydp0wVPxJnoC3ph/ww2UFVYB9S/dx9Fbxoi8+v3h3D8rSD92N60rPAMByO1C?= =?us-ascii?Q?QYMtOyQ2UB95m9HYHBnGTEU6Gag5ivap03UPrUmObJgvZStsLix0f6qFy1yP?= =?us-ascii?Q?cEUIzD31wg8KpKeW2ZjYJsTNYr6pVmXq+1K6pWoUbZ5Zd5IKKmO1bZdDs7N6?= =?us-ascii?Q?YaE8bOTSPyiLphz9K4kURftz9U0paA+3lZ8Uh1iQIK5N5+0op/4skLWRW1oy?= =?us-ascii?Q?LtM5csElOUQFSyhLDzDIElRy8JppxQJklGt8t6jCdA0otin1+SnS5LAQUAak?= =?us-ascii?Q?tG2wSEXWbB+KhuMatHsosRJ1zphrc81/RF9EBUOrXtk9OWVd5yl9pQaSIyGo?= =?us-ascii?Q?TGiW3lIj6icDazDdiT+82yAAy3QdRSqMywX0wniQN7nz4ao0jN28uHEuVBfR?= =?us-ascii?Q?sZrdp7w0dd67lhRn8ZeZ7uamzkqwEFMzgW3Iv2KuBbcEUWEh9A0SSrRFDp9g?= =?us-ascii?Q?uq5NIWM1AkP1Bow7MIi9G35vHzaKFhy/VeSc1cMU/TmgRGWO/h2VgvulTH4R?= =?us-ascii?Q?L/Ti600838b5oN2KJJmsYmFXnDPqTOWuW/QkzRxiTrSttTNImxGvKlksaIzi?= =?us-ascii?Q?3d/4rJm5QWYFer0zfnImNrxTLiEsjQWWZPQB+tN+jkLJBfHLeIDNxmhRagtx?= =?us-ascii?Q?/ewxOwauGu9xRzgqbmXUv3UakSE2ncwL2Td6QE3FS0enZKC/zje6UHu7HF59?= =?us-ascii?Q?y5o9lS3mFpMxuLln9yEoeMez0HmNFsgHeQoWw2jWOLFhnxkLNTBfgerKGtx9?= =?us-ascii?Q?O31nBiWvtjXAAi3lhggnKwGD8EBbMvf8QfOQArI2K+ze1fz5A2pVIJQ=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 6:aJHu1AXc+SgepllP/+CGrHvqd+EOVoznFREkLyfLMpwP5EaSSv91xGiF9kujZ3XafD6dB2sxW6UM46irjvK9qCc6NwGSNx6Z8mXpOtRqQsmHd3xzrfVV5rpNGJdUPVVcbup2EeL7tYeL55KkSkDrwe2tksUDkmdhRMryElFa05CvfBpzhGM+ePzQ+Qs63y/iVDdU4aupMfQ82KYWb42tHRfSvv2BXfO2JqeiZgMUwRvTHFD7YvgJjvtQoXoqZ5WclgnjP6kIxMiNoTMHq438+9kLu0uu9QN315BGVzsvE6pxEJRDy2Dqeeg+9KGFFfMFY8SwokFbBD+c1q2TRcS/vQ==; 5:4xvI4sZSjUYbRn+IQym+adMTlQsHmIy/Q5YKYjt5e3gS+CNCzvUR1B33R+I+iO8BQzO2unEEOxLjishxbKMCcgTr3uOrA00FEjWsPEJdpq93QYEV5D1JfRa4ZAgnEMl8CEkLI7Iuw0jmCXfuy/cD2g==; 24:RY1P8WDy4ED4XbgNbELipQAPMnwqmtaWLUa5++gA9cV5bTgbDAvIjhqIpYeD56O5SziCuhAP4M+WAKb8ExgTgyeo5xkhXw4pUE2pS5WHGak=; 7:dP70pEHV0PP7/mKPWmDqn7SqQZeDrySEpL3r91zaxjvvURVgLhpy157Pflq0E6Zl5AaMrTJ29PziCwRpreP1m3Zcj/vHgcchIRAcQGoQ/w1SB/K88wentkiNEBRflYBmisMdrOXSIhXd0aCmTD8BDFFzYLqAhSkoOpGgmbuUxIDupe3TUHWfpUZYyq6iu4bL5DztbGNFrPzIp03LC+HZckGsfhmgN9miVrYdMck01lMoWMFEdGtWZaGAzUn1Syz6 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1448; 20:KrdF8lt402zYapiIho08ulY9c8ebwVQkBXXXjgUchnNj3slFxAWisDTVCyJAzYjTtddZq5GZnIP70IFFLzrXrJ4Tdbx/kwEXvTJsrA/iJGU+4LusadOTcrGS2doaVZInz2uJuar0ioLOy6bKMr2H7Tr7SFscNyV8jWfS0Rzcp9I= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2016 04:59:18.4420 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1448 Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 015/127] ASoC: use component probe/remove on wm8580 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/wm8580.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c index 2e69270..2a812a9 100644 --- a/sound/soc/codecs/wm8580.c +++ b/sound/soc/codecs/wm8580.c @@ -862,8 +862,9 @@ static struct snd_soc_dai_driver wm8580_dai[] = { }, }; -static int wm8580_probe(struct snd_soc_codec *codec) +static int wm8580_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec); int ret = 0; @@ -890,21 +891,20 @@ err_regulator_get: } /* power down chip */ -static int wm8580_remove(struct snd_soc_codec *codec) +static void wm8580_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec); regulator_bulk_disable(ARRAY_SIZE(wm8580->supplies), wm8580->supplies); - - return 0; } static struct snd_soc_codec_driver soc_codec_dev_wm8580 = { - .probe = wm8580_probe, - .remove = wm8580_remove, .set_bias_level = wm8580_set_bias_level, .component_driver = { + .probe = wm8580_probe, + .remove = wm8580_remove, .controls = wm8580_snd_controls, .num_controls = ARRAY_SIZE(wm8580_snd_controls), .dapm_widgets = wm8580_dapm_widgets,