From patchwork Tue Aug 9 05:30:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9270319 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 ACEE560839 for ; Tue, 9 Aug 2016 06:17:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D5952842B for ; Tue, 9 Aug 2016 06:17:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 920A92843E; Tue, 9 Aug 2016 06:17:52 +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 AC3F72842B for ; Tue, 9 Aug 2016 06:17:51 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id E0A5C267B72; Tue, 9 Aug 2016 08:17:50 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 4A0A5267723; Tue, 9 Aug 2016 07:49:27 +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 9B55026771F; Tue, 9 Aug 2016 07:49:25 +0200 (CEST) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 6EAA72665F7 for ; Tue, 9 Aug 2016 07:30:11 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie1.idc.renesas.com with ESMTP; 09 Aug 2016 14:30:10 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 26A29471A4; Tue, 9 Aug 2016 14:30:10 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 1836A480A4; Tue, 9 Aug 2016 14:30:10 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 10A7348014; Tue, 9 Aug 2016 14:30:10 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac4.idc.renesas.com with ESMTP id QAD05712; Tue, 9 Aug 2016 14:30:09 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217010423" 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-SHA; 09 Aug 2016 14:30:09 +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=NmvTniI+6OH9xD53+KFPhT3RPixub86D88rMEyOH5aQ=; b=hzn0WbfFfTY2ZNWDXxHZuQVvTIt7yLwLQMz7O5IxUo/Hvr+xf3buEkqBufX7E+64gBWj+u+y6zbWY3B4XcBOKOQHNwRPHCYLpvcf/2efH6VRrOfzt1fBwcBYoIkYHRo5xZ4sBaGeYaYbjyu9RAHyHMSXnWdrcwJcBB+RUsLzI68= 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 SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) 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:30:06 +0000 Message-ID: <87bn12a54p.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:30:06 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR06CA0027.apcprd06.prod.outlook.com (10.164.91.37) To SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) X-MS-Office365-Filtering-Correlation-Id: 910e8ec0-f515-4bf3-30af-08d3c0163919 X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 2:MWXVbdKdhc5SAwtKeEkoy9xoUC0r4xZv+RgFzHNNr8wv2zC3cUiuIF0x35k345SMqGHpjAnMHACozaL2yMjoxjTFK3WPYMgrSegFqJCAYfhu2Hj4s108hR1VCPKjLDLRIDDgoOoFXUB2FlenKeo3uqwQXwqMAKXzfbO+po7VKPVkOwDBFS1nvl8O8LVbdBDp; 3:uz2ixgbjMdIJNwmw2Z3QNkRlDmWLK/1gTqzw4r1Irwb2XfQQvgBLfKxnj8sW7dNiDaSI76re7jdSpupD1S2J3AB6ku6joNu6BR8hEA6L1AnW9SIZu+we0Dmn8VFMlr/V X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1453; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 25:FlvHIMY9RpTMHIF4fSXuSgyM4F8LE8keUrQ4xUp+bVaUCkLfp8BncY7klOYVX1lRRsciChbUewJ5mIeANVcGd/gLirJSm1byNUWlhRR4VogmxkCjs0q0PpYSQuVu97GBFgUEnu4SlRqWDrvkN9r9kNfQRCvoFhylT0BXbE3buVXmMuBGkFMGEJfeYnp5o3E5IvbWGvbATT3GhSc8PacmTlx2ZO6Ssrjkm8Nt00QjsBUXwtLt7dLdyS1RxHfYsNlcrmQH8XOiUHK+lERRo5TXO4E0cR/VrhB3KsRAYmg/CKFvQc1lG1lEwaZoPBlbmeGLNfGoneJsWsJZ/Tyy8EvPb1EDGXfrIittp/xjJMdHkHgZybgCAzJGUX1QZS3uEFYLRO562dOV45lO9oGGjIje+9GwRfKGHWa72RfozJCQR3dxPkV58qzCdAQQngF80rQsZbyqJ0aYSsPWip8KHW6h/H8lW6gJ6o8DZRigyGg13kwzHj7YsoZPRzgyQ5nNAKZSdQlYbMv3wMZaG6GF2tRkiauveYVx2KnF+4tYAeDGjMvUE5jUyig6JVbZLXCsGhx2KL7Z661q7drMR7JladGm1GChO3NH+wGYCGBOs9SxMI2Fz6Nm8XOIxDgusfHojgJEF1+h0lsxdfk7813BurAmVnqhT4+pjNvoHf4roLzqvDTC9oVrzNPbSpn4K1LXp7+cRiG0mnCjEdgnV/5EyiE5O5DRFIBY+/kCgKrHBBUYVH4= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 31:JLIVF3bNk8snpVwdUEIwQevAERx9H1SYqLSlBZI2C3uT9KNdCq1QS/uiKPNm+N5masPe+oEeEBLVcmAgYqb7UPDUl/g1HKjh8jMziLO8Xq86G0Yl/TEeCKg8kLHI8La6oeoZX/nK3f+8C+galN5RcfuJf3+2Ws/Nj9sJgwfWCTopL/o8OBALMXS00SGvV748mqavchAYUcwrfYDHR7mO8iZ1RjhEve9XcrGqhiycgHA=; 20:d1zPzy3HjaU9CUdLQCnK9KeQpw0GzaDilDq5J2XFNV1Pjfzjo1B+JqHR0kca+Y73ygFaufiUAdmbtg4Tr7nkxdAQC24sJMOiUjpns+BWpiFRmx6JnWLH3Vnxo+hTpW6aZ/ksswVIHcbIuQfXWXoTmuqeBTekGRpIGOyvPcM0npVDypKty5KDOb3vCfmM2iYnkBX3JirQJVNhg4OGKAr++deo0UowIeURsUjDGy649h9ZKv5j328o8uIFcQszoaaPgWLeglmws2TEC4Qq9HSse1xk6zgjiaPuYb0Au5Ohre2XhHoQS21a5RsEgTUT5cZFqMOaoPDPO4nkePgnqfbH6UvHEarU5mL2+lJYlQwzSeSmV3RH4h9pWOV5XL6aB4yhVQ0mrZkiXKiIFHOoqGBU+mC3OebVKuM2NML5eSxxs1hLJzC2GWkE8r3HuyoPS4wcKzm7PG9uUKOOQ/ZIyUF84Ql0vRZa4ULtM7MW+u2fGcJo+I8Q7+I4pZkohV5iG+UE 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:SG2PR0601MB1453; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1453; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 4:LJr/z+gUf+9ML9N+sQlt9sCt8TbGgrMLVvc7NJ8qJXMa3aIHx6X8wPdstFTfNEdX0CZdtczscPWnK0zdE0yh+wwYczz1s2QQUuMS1nOderHQCrNkV2zNV05Tdqp+I8NVAD9oLAow2gMMnnm7iQ2ZC4zDmZ1866m6yy9ezpRmRUtYe9iKziuxshf0BiJWIuZPQMb/SxGbYMGMTm+vQCgepteK8hOii+Xc+WZ2UDc/JGK2bixEFkTFJmI9vdTFjbCGsS7R5wmrdcgH7/nn9lcoR1SB34M67jZ+lMFo8GBxA0pBB728wTpcZILsJpn0wojuLk1cgDv8jrX9dBysOEVbiqJQ/gkGR4u9fYoZ5246zC0xgSLX+55mcxdPhgYuL5wW5kzqGHqamrcBGCGiKuVGKQ== X-Forefront-PRVS: 0029F17A3F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(36756003)(83506001)(69596002)(19580405001)(19580395003)(110136002)(50466002)(46406003)(189998001)(76176999)(54356999)(106356001)(33646002)(50986999)(229853001)(101416001)(97736004)(66066001)(86362001)(4001350100001)(47776003)(92566002)(6116002)(105586002)(305945005)(7736002)(7846002)(2950100001)(8676002)(3846002)(81166006)(23726003)(77096005)(81156014)(42186005)(2906002)(53416004)(586003)(68736007)(4326007)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1453; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1453; 23:Fgn9mAW3X1pCbkNPqiVpOQ8J1++dze/Dfu/LZqc?= =?us-ascii?Q?nkApsMfnpS+sidqXxAhtJb1DXJiDCxRFtuLkSDbxbpz11sToLgBL8OHTWBkv?= =?us-ascii?Q?ysXm36wkw1DDwBDr57DDshlCkIiX7Dv4FkA3E12TKhuQBhHOsCnSz5SuSKw8?= =?us-ascii?Q?XkTqJdH9vhBIU3V1UNs/7jY8V9kCZ3itgJlwYf3thhETdJK0RJmdUH9qntdM?= =?us-ascii?Q?K9HanM1G1GOKEOivowqhPFAZ21wNKzTFiFP6uRoLBNgjXL3384fkqVVc3Oyf?= =?us-ascii?Q?lPoLxVvHPDwwe4SWWTAc5j7KKT8qkOsHVulVG1cj7sKBW2YuTW5SyellN2Zg?= =?us-ascii?Q?AnD6Z/PWqJcQuj9N25MrjN2xl26ENQGvGEUMPjns/sHxO7m6KXWNkAnVmooA?= =?us-ascii?Q?aR2w6A6rZqgt2QO+UXSljd/DMbMc4kbK0GhH2xtcEVig24Yo6c/CdgKj7NBJ?= =?us-ascii?Q?k2zze4kWWMNkLzpIt+d+0Ub61ohnl2/ZcMXXPsCi8BOGdlhx/3l/tHrZnvMB?= =?us-ascii?Q?fa8wgKpbal/oeO1rfIODagnqPgXBEL8zrHcxnu21dIaBYql4F049EjTzNTZr?= =?us-ascii?Q?ea58Jlhhw8pkJ3qj3Lur8l72xznhia3b0synNyOoDLp0CNywyorhbmMeB/20?= =?us-ascii?Q?NXW94Y2j3Nvn1zoAWEgEJbwi1+9BSb4NkMwCIduwpQ9eRTL7nobJHVUMlNsv?= =?us-ascii?Q?Ft1Z365DFvyxWWp3W9GyEJDpobQR8kh0hNn+y5OBLYYxIxueJCIPiTesRPhS?= =?us-ascii?Q?guwCY567pgxMHd3jVq3E7Pf0NuPcZETxARtNWdthDMHD6yKqDB09zSQiAcCw?= =?us-ascii?Q?V1CCzvWs7llWL3Sa422li7CnjOaAxgCCSJ2pyvEV8unWjx1ZsrSShM1R7O/q?= =?us-ascii?Q?vKhItX5g0HG/vdesNGun6O1cNZSZ8d6P7zdWis6TLCFTE1I5AlKQgJ10QU2+?= =?us-ascii?Q?iJDjuyLWMCpGxxrUhInZdsXitA4t47u4+zVuD2HFSx5UDQuBhoeXnvbOyuiT?= =?us-ascii?Q?t+GWFlhLuPiCnuJ7H9JcAFhBaTu7WlsgGp4bLe3JJp+MVzDyZx4IIhyP5Ppy?= =?us-ascii?Q?Cul40osKXAGDLXcnf1lRa5ztyalo78KJTJHhcRGX2PJRv+WqYdRhfIsD1AlO?= =?us-ascii?Q?3QdPVK0vfAcd0gz5YHTzATEL/s7bgyATAm+bGdV/I8m0GkzsyiXx/pw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 6:0aqb2NwiXPDyqsTdYiEoTdCRArRzOahT6eFdzBpDOpMTNa/+YYTZnFUeFlDyWJfGcCn+JyYZVGxx8YqHc7tRHMlHprja6t8/T1Rh1fqIlSYCUVFFKqOYBpNEd/zoAj8JYDlQgmUizr1S4ux309zjIbQJ5xTrXXYdEhpGu2zpsaGfNyYCgJ/cGzF+Bt/MXDULRADyGN9LxjcL9TLVFo2WuKxGPM863Ga/D9fqDLJfiEfoxqGPzeWda7pW9VBPSTRCpHMnLKoPuSDSLjwkrvxHJaOVC7thuGNfmq7mWLHBoge6ZTMxOWSSczGsm179f5pW+b2mOkCKvt8JmyvuxgaHgg==; 5:csP5k6pWoauBJIzrkUHyee7MBa1VbyAun/lRy1r73WEvAky7/T4JP1OWBNhD9Fnv7AqPXkMM7PRHQfbujUrn0yvEI06KkBiw1/gnCylWv02sivyoxGwuQd96o6Psdmob9agUNvJvml2P+lsaSncv9Q==; 24:T+e4D2PGtkjQNpV1GPKc9JaXNTB+I4qISdnh2qyYXf1oZ5mbTDgHy2FADm7KOY7D/OE/ZUfMAAIhk5GGxPUGQazr624Pg37kU9yH2I+hdnk=; 7:GB87VaHMyr/rUbrToQNIXYjWy5T28KdZKSOxms7XjO7H0THdTza31wPNeRZBJM+BjT1e2ZXYqHblkUhWDWGQBJIYY0evXbq6KOxn7pdRY2Y9CmWfmALeIhXyIWcd/0iUoEdaWJl5ySpA5gv7PUnxMoiw5xVabvFQMRh+8J/lfGimUI3B7lVMjtOjc7ep+gj6UIf1loKLbj3S+bBGcSwuVWKLRX9kDYnH0aHZI5kWYsFsQLx/cwWhfYZlrF5aBUsq SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:PP4WTqUs8H9AII6FlyLfljLuRrXrdIRCa1zRHUurrUJz22H37CHZH4Fan2PeTQKqtdPOxeF4wk6D0EaiRRsaeAFaNIBxSjLbQWfh8T1cKgYLPk09z69EPYfE8wiAGOsIeny8ntKiFK5bZBbSa7eaBtqxt1AypBMF5vxsknBQYRo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2016 05:30:06.4123 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1453 Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 085/127] ASoC: use component probe/remove on wm8350 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/wm8350.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index 18bc4ca..9415da3 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c @@ -1455,8 +1455,9 @@ static struct snd_soc_dai_driver wm8350_dai = { .ops = &wm8350_dai_ops, }; -static int wm8350_codec_probe(struct snd_soc_codec *codec) +static int wm8350_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8350 *wm8350 = dev_get_platdata(codec->dev); struct wm8350_data *priv; struct wm8350_output *out1; @@ -1550,8 +1551,9 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec) return 0; } -static int wm8350_codec_remove(struct snd_soc_codec *codec) +static void wm8350_codec_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8350_data *priv = snd_soc_codec_get_drvdata(codec); struct wm8350 *wm8350 = dev_get_platdata(codec->dev); @@ -1576,8 +1578,6 @@ static int wm8350_codec_remove(struct snd_soc_codec *codec) flush_delayed_work(&priv->pga_work); wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_5, WM8350_CODEC_ENA); - - return 0; } static struct regmap *wm8350_get_regmap(struct device *dev) @@ -1588,13 +1588,13 @@ static struct regmap *wm8350_get_regmap(struct device *dev) } static struct snd_soc_codec_driver soc_codec_dev_wm8350 = { - .probe = wm8350_codec_probe, - .remove = wm8350_codec_remove, .get_regmap = wm8350_get_regmap, .set_bias_level = wm8350_set_bias_level, .suspend_bias_off = true, .component_driver = { + .probe = wm8350_codec_probe, + .remove = wm8350_codec_remove, .controls = wm8350_snd_controls, .num_controls = ARRAY_SIZE(wm8350_snd_controls), .dapm_widgets = wm8350_dapm_widgets,