From patchwork Tue Aug 9 05:28:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9270303 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 B0D9D60839 for ; Tue, 9 Aug 2016 06:12:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1008283FE for ; Tue, 9 Aug 2016 06:12:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9212F28435; Tue, 9 Aug 2016 06:12:02 +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 CC8BB283FE for ; Tue, 9 Aug 2016 06:12:01 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 028922676A0; Tue, 9 Aug 2016 08:12:00 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 38056267A9F; Tue, 9 Aug 2016 07:45:21 +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 2EF5E267AA6; Tue, 9 Aug 2016 07:45:20 +0200 (CEST) Received: from relmlie4.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by alsa0.perex.cz (Postfix) with ESMTP id 28AAD2669F6 for ; Tue, 9 Aug 2016 07:28:05 +0200 (CEST) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie4.idc.renesas.com with ESMTP; 09 Aug 2016 14:28:04 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id C923E4488D; Tue, 9 Aug 2016 14:28:04 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id BD0A51806F; Tue, 9 Aug 2016 14:28:04 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id B5D621800A; Tue, 9 Aug 2016 14:28:04 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id QBA20525; Tue, 9 Aug 2016 14:28:04 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217521496" Received: from mail-pu1apc01lp0017.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.17]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 09 Aug 2016 14:28:04 +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=L6CkYXXbN/WwPG3vX0C8rPIiTDmiTU3ouYnhET2G3Dw=; b=AIazL1w8lg7TkV12VAL3LshWuGlgRJ8MH+B+F/ZYBRuaQW+kLkXB//yKk/Eo6M6U+o6Fkc73pJoa4VQVFByFTfgQbMVulnegr1/Brb7K7ZHb3HfhM/XWS2UkBcYDVgq7nEXxvuuUWXp/PpIBuQJm80kFJpYvtPwTh0ibZ+HWQtg= 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 PS1PR0601MB1452.apcprd06.prod.outlook.com (10.165.210.156) 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 05:28:01 +0000 Message-ID: <87k2fqa586.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 05:28:01 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0026.jpnprd01.prod.outlook.com (10.164.161.136) To PS1PR0601MB1452.apcprd06.prod.outlook.com (10.165.210.156) X-MS-Office365-Filtering-Correlation-Id: 747b48d1-beb7-42d2-ed48-08d3c015eeb8 X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 2:q4aELxTTF3EWO6vg92xfTpogkuyzPQapQFibA8Sm+f4y3at+MbtPwp0EFnGSbUkV3n3CdVPxad29koVmWAudMxFF0CcZS1Rcq4Nmr69gVgGmJWQMWNYjFVFBiJ9Bt08nBvyDUplZOeZjR115DASUqfkz+0xOD64j1nnX6NVEWYpIE217qRqjb6VPgXi9qZVL; 3:Av4RnN+DKidjDM1gKlYmQxbyaZb5lYZ7yg2bKS3OO/8xJ33gJmfPxINiaWrdcbgLjWW+MXNlYv6rpn554i/mPHClCHN06gwcbWndn3pWB8a3M2jFXdx5AsQgQR2/mfta X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1452; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 25:C90JC/ZI4EzCAqBEEerupBsE0B3QRfeCFOIPJMDGt43XzEGVtwPlTZhzvzzleCwxkqFRW5s2QQKZyI7YUNiP0O4Rbfesf5kyttgmWSJicO2ImIic21EKbl5wO5LjKDI84mdHZm0V0JZRAH+VAkn8APjB1moYylOiypbjMcqumd3E4QeqmYTmgUDfiDYcpJ9C0l9kEp5UHt9PvfpnYRJ4vEJq17NRdUhh9Al3VEH9vueu0QagI41no2MUH0uaFatM4l26msepziJ2ap1N9Oa29dZghtVOK58HH+DbRxQ61TklmevbHU5XDP21e7GSNVeoSnB4e0aSPGrXHRLXm/boGvgDNwcFWvckkLlxIqf0rHxlfkckKpKlsGyxYiszmKEjqMoF89BXu1Ho8wy/XvhBtdqdZ2Z6aDdjxHgWdJpZdmm54pHRXufiBdoLgQvg38G7NO7EfFdJJypVJlo7vOu5why27gIjzssN9Y4L+qwG4sjhxoY6GcIJikn4Wz1I85SckwXrxeBBvW8kx6HXAPp5O3AgDkxieHYDUDorITVuzmVm62pBXBoZ4mGFYlGR3wcro9Hh5YEq6iCTvtVPuSehrK+Xhy2JMoi4m1h9P2Xe/Io/gVh3BX50qmnJLe/0leBScaJVaSybh205HzwzG3CKU4an3LWuFA93pU0uG63X97QEV5NhHsKBwFFGfZx5auaAIT1wvb4L7aKYd6Htd3DTjWyNnEi5+GVKfwBIDDFwI1U= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 31:a6GmchGijIxuik5/llzpGCrYtIBsSf0e5J0drGWszv+cmsB2fu6TLfSoa3nQWOS92DFEwouA9TByrqHsr+s2IZW8avkl/57KOimaAO4VgbYXkl5pA4YJICMloylnOh2bMBlDTb+s31vYbPkehAN7kMERniyvQwiHSf50Z2gjo7DOcu2VSwahrXkZnj7li0xMxV8Gg0ofX+xViVFQtdSsYYcgEAwCjHWHv52izsBgvvA=; 20:UGihFnFvEDuVo6W/aUPYsq09e0BqYpQK4IXMtk6R1PtA/K8kw+YrMqFscwWG68Uvus6aufjBHoQx11p0tBfTAc1asAsQjpuLl6PVJfUaSQVuIpu7zV+ASqOxvWbrtD19pGOTXu7qq2vRU1+PdEjKk2O2WkHFzKYWT6EpHJUtHWB92YsZP7pkQaV3H06vsklucy13iSsCpvGKI8+RbdmW8YBp7I/8sdPr5xO3EVYhg3jQm+/acO6y4rWyZQiOscCmOPkzO/4ChJDgZjkPCjmq/GVJlU4SAzpr1ifoXdcLM1n6dodmPW50vnAjeS9EmAhSIV3ZY+QwdXlT4vg/IpFUcExjGFypJDcbCF4XoS54ahfnxD9CQWcW5sVI7+3NimkXq/k9LYnbO/EdELFUchn66zsYq1Y8tuBjqm5EhWUxrk3YgAMmP2CD+xnKB7CZb7ooNyAuu2ZkQNwBm6lFMM25rTHU3TaiTb3vRZ3bfeqK0ZcaOOneUTM61BaJ0UtzQXjb 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:PS1PR0601MB1452; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1452; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 4:nFXG/fMPdbjDcljlOypHPteKZwAqxM0ExKc2hc4j/6hKxDyJ0EkXnBvJjbeHzbvt6yyw4enlcCjvdVMI7Op3xQfpR3OhABvSGrYBWlOHWrlBOtnN6GSbMR1KkFUuoB/2JeQ9RIbKw+NHfKObH6Q0aETF4lUBLxjLVxLGZtL7jjGbSc4qUNDZZKLBxOjjFgFLmlLFIQvqCbF7eOhTwVaFMNw76gDvBsQYTYQhR2CZ9Sm7izdq/PviZVyaqG8F6ma9xiPuVZdSfLOx4ImZU1Bgp0houHX7CGy2tm6jVfgMGW3Vg4lOJL10QMEQp7DGlbdH0zWPeorhMQfL7eRD+z3ROI6cRn/hPdky7W/aIcrLTIqh1a9dmNPwuVDneOZZEsz+zXc4VkoF8nLk2yFiFkCpWA== X-Forefront-PRVS: 0029F17A3F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(979002)(6009001)(7916002)(189002)(199003)(46406003)(229853001)(19580405001)(66066001)(19580395003)(92566002)(77096005)(68736007)(33646002)(305945005)(189998001)(47776003)(110136002)(105586002)(83506001)(69596002)(97736004)(36756003)(4001350100001)(42186005)(7736002)(101416001)(2906002)(7846002)(50466002)(23726003)(76176999)(54356999)(86362001)(586003)(6116002)(3846002)(53416004)(50986999)(2950100001)(4326007)(81156014)(8676002)(81166006)(106356001)(16060500001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1452; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1452; 23:Mh8prgkjxGmjRLWioJPZw/KT46cNhqkFpj+lzT+?= =?us-ascii?Q?7QVlkIdPjdQpqCGIcKXCQVksfwcyJTvSPBb94SrSlD8cO3YQNUWl4s0FaHIE?= =?us-ascii?Q?gFvY8mRzm1/zQyS1ChV/L4hlQKzgoJ4PosUz2sR/1ThpEwc3AzgkGnw39/ph?= =?us-ascii?Q?8rVcMWDzq/EXEY46SboJhpA6DfRJSXsoMFsa3jMuDpX9B0QVpQVHsobwjsRO?= =?us-ascii?Q?dLD6TNU4p1GqOeg95Z0wKVM7dpsmAq3scREEXBhMINWA5LIw+FjZTPS+e+Dg?= =?us-ascii?Q?ErY2CoFS7Qg3nK17R/EOwJYlQvLQXi2dGuxmVrSFXLsD7vgvSGGWtmTHhhlK?= =?us-ascii?Q?/lEwDAC8ocHflmWkI4/YkTDJf6eTbzhhRmey24XUt50F0Y31aWS1vR5BnSQf?= =?us-ascii?Q?E5GZ1zT1rS2afYv3L4lrAWWFiZyUEkK2iPGcEk2/DtKaAVN5h0RI2Vz7s5Cc?= =?us-ascii?Q?Y7HQI6giTrIiAp3ggt+fF/mmc0236pGwc3KQJ9Gv66SBus+GrR0RFxyeha+/?= =?us-ascii?Q?BCsDg/JtHcvxBzUv9BlgluQr52QCspVTqr6rO5A8KZVG0PP0MWRBeRMTA8tI?= =?us-ascii?Q?Czyz6eX+GiOUwmiyXEQWUcCSNrz1LWeieDQhnqnk+ongkgD5/BSuEobO0Gs0?= =?us-ascii?Q?plpH/KSrpBIeQ0yHW+7rCiURDF4LA7izhRbOUO1EyQiIFlypC+E9p6vwKu7h?= =?us-ascii?Q?s/dFYpraU33sfMi7LXzRI8Vpc1NKg15T4BHKm43oLo83gQR6I/dC9CWsj26B?= =?us-ascii?Q?pvDj763rkOnWCMzoqfGzR7QB3l/idBQf5z9vktWYIovMdOXbdo9YNbz/nTe/?= =?us-ascii?Q?zElnGD89wCXFofpwC73tcgm3eKmBuEs2erHr6+e4EJTXG3EiX+7omRZzervT?= =?us-ascii?Q?+yMonyak/TMa9cUD2dRdhk8zhAoKIazxMpSGL/QdobIxLJ44+unLcUKgl42S?= =?us-ascii?Q?eV7H4um8tb35tEeP4nXljx29YvCbJg7V21wlpa5h32Ys13ZCZvDXz/Cp5TDp?= =?us-ascii?Q?VoKyjaz8k0KRgSoXmDnCIYKpAw6b5XH16pOvQ2uCRHPFCia5NWG5n70iYMvl?= =?us-ascii?Q?9NUZXGHneyLf85UF1pEU/vgSKPiUAh0v2WDi9nbK3tIl018x+EHC1V2Qsqmx?= =?us-ascii?Q?bUjuifcsdYhKcByEFTKJe65g6ramlwBfEOVGBOzwCTwxVlTs7K+Nu7YHyao3?= =?us-ascii?Q?Oiu5TiRISAYFFPYSuJEvPVglSSRrFEip/pI8PhmvBHRL/cg4wCfP3zq2uA8v?= =?us-ascii?Q?q6QZMn7bb67eI41t9TJ4=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 6:xP45eVf9PE/WxiGJ4nXtBGYK28or/uZwHvEm4uLjgnZRBT/H6HEpa3rCaOqSWhU4s+hw7pCsT7VZqN9edARIPxO0vJHvzgDIx/6FiABjtfQJrNu9/n84YXJ6S4CZEbgSbvJ19PFivOk/CMlzVbRT7v3lw6mHaZCnWzYBup7NpFTtZjmzR70FDPIpWyv0iMkcBwi9mGXjME5pX9tYWqCuwpILayArz1M/Kwnn4oksmx2L8Zxu94hDum7cw2gSGPPHvR3Q8/1kv+F0bIQEo8189FTURY0tdqFPD11v93BnxJXJxPXVjRllEo4JUcQvfht4UU/PvBHyHrxfVlmjWu+uOA==; 5:KxcozvRlForBndb0g2ay3aQFr68ZyVmwNDyG1HqCkdgBDdcQDcom3nbJAwnYb6zRRFcP/Rr5fDK+RLxscLOqza5UiVTivqxQFjLTHQ5D180SzBBEjgXyTxb3vnCHC8azKuyrCtTnwLgY6/1662mQYg==; 24:mkDiEva24d4rIexjHQDzUi0eVioh/hmt7TAvzhuHJM89yf2MQQgDrMsxCXJYqPUkyX0XFDXEfNG6CqwbqUlqI0c21YaaGoYthL9+O9n5N+0=; 7:11Z35NGEsqoTJExhFNfjqHQ+ikntAcj5nbG6nzIm6t2EZQ2/lRdvAZrW6Oko0TOEgdWd5FMar+NK6Y5dWk+deqzhP5y9LBexL4TK1oxq555yVYixgXZ6rvjuoXPbBWUB6ka34rNpsxtkNnovxhawgEE92wwKlMH+HHJxmEjzF6sp//L92xvArWPdhtadJC0GpVF3rNz064iIeNsz5FY3ZFrQO49jc68+qjVLfz1hnnIamz8whsW4/d+PNsUQBRGQ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1452; 20:Ziu2nHnlAe4GhPRLBgFcciNOmcCWuzzt7LQvd0o3yRs+R4iYxY7WwsXktzEgylfnPiMPnl3nT5U4YtCL7i46LnZjwD9+KiyDKbZYdwMywkVjXLe2E5QHLFmGsh7UHzPijgRZVJ+ldpsTeBvjQlYyzwr0NrqEfp2YPN58RPJddjo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2016 05:28:01.6920 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1452 Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 079/127] ASoC: use component probe/remove on wm8961 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/wm8961.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c index 4b51761..1f4db6e 100644 --- a/sound/soc/codecs/wm8961.c +++ b/sound/soc/codecs/wm8961.c @@ -830,8 +830,9 @@ static struct snd_soc_dai_driver wm8961_dai = { .ops = &wm8961_dai_ops, }; -static int wm8961_probe(struct snd_soc_codec *codec) +static int wm8961_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); u16 reg; /* Enable class W */ @@ -883,12 +884,12 @@ static int wm8961_resume(struct snd_soc_codec *codec) #endif static struct snd_soc_codec_driver soc_codec_dev_wm8961 = { - .probe = wm8961_probe, .resume = wm8961_resume, .set_bias_level = wm8961_set_bias_level, .suspend_bias_off = true, .component_driver = { + .probe = wm8961_probe, .controls = wm8961_snd_controls, .num_controls = ARRAY_SIZE(wm8961_snd_controls), .dapm_widgets = wm8961_dapm_widgets,