From patchwork Tue Aug 9 05:10:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9270219 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 D0F3760839 for ; Tue, 9 Aug 2016 05:32:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF0E7283FE for ; Tue, 9 Aug 2016 05:32:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B3E8128435; Tue, 9 Aug 2016 05:32:08 +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 D9F66283FE for ; Tue, 9 Aug 2016 05:32:07 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 0008C267351; Tue, 9 Aug 2016 07:32:06 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 38B16266B1C; Tue, 9 Aug 2016 07:19:53 +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 85228266B0A; Tue, 9 Aug 2016 07:19:51 +0200 (CEST) Received: from relmlie4.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by alsa0.perex.cz (Postfix) with ESMTP id A7360266B1C for ; Tue, 9 Aug 2016 07:11:03 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie4.idc.renesas.com with ESMTP; 09 Aug 2016 14:11:02 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 5CA5E476EF; Tue, 9 Aug 2016 14:11:02 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 5935E480A5; Tue, 9 Aug 2016 14:11:02 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 587E8480A4; Tue, 9 Aug 2016 14:11:02 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id QAG32315; Tue, 9 Aug 2016 14:11:02 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217520326" Received: from mail-pu1apc01lp0022.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.22]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 09 Aug 2016 14:11:01 +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=pWxWDvTvYmpSDFVlYVDtMtI3SGthj5uVRKDnAXoUKpc=; b=gOH2BnveqEWdB1qus+2y4q4uHy/gyBz4z2YjMeXRVLsRUrYHwBlcszv6GZZScYjscA9Ly+PeBSwiXsUXAKmmP694YboOQQqJGcqkWvJE/QMcieUEE2BVRF1L2FPh2WrWPNQOUUpRFu8YDGIyaaFYVzMyyIRKbZgsM4ddui9BsKM= 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 05:10:58 +0000 Message-ID: <877fbqcz5j.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:10:58 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0020.jpnprd01.prod.outlook.com (10.161.74.158) To SG2PR0601MB1455.apcprd06.prod.outlook.com (10.169.106.21) X-MS-Office365-Filtering-Correlation-Id: d1a9f3bd-3c0a-499d-5c4a-08d3c0138cf9 X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1455; 2:ncT7NgZoiG1Rej1yPTYXh6NkfbD8ZwTJGp35d39kzhlGIIY9fpyRI0UrbHIFoPxcgyQTBt/q7wq1Cno4sncxpOprjN5NvGKvVXhC1Il68+Sk87RY25uOyYdFY+2vyXF4x8SGoOhatyorkW/+D0PIXKCGT9ta4R9OynOyKq2RX58kbZKYYLY+MFbQB54wDLiF; 3:5Y6lZgC9ClfnN37VnnJB1uLQ+lk0F3Dd07FWWWk6Gph3MSXq+Vfx4bjqwXoUODtNPOm1guheIwe1ZKRf8XjHnZDUrYz3L6pJkvtilZNK0lUHO3jQ4DEwx53HUAUJei9x; 25:w8HHzZDA5zAbYB5ISCUrSpF31k0Les6JNh5obPzGbaY3q57TZYRPujKmwsPZ9QMwTpngrzI6gZ4xVloplsOA+hMJOxoXMX9w4obWwcTEIjHZc5B5ahau79zIkiVL8W6Ts7g4G5xlvJRUh6eUPsIUYp6HwjS6vg7+tYM6F1m0rZ34BqW7FNej4fWmvHpeTV+AM4r94nSHQqFg06EL79KoTQ8coJpX2hUanHrHvHe+LQcxetdMqJX9pz3YV6pqEsALgETUvIdUq1cXdg+63IRSbZBg5TTLGSAkYERg+/kmYyCBvUKEpRHUQMhlljWMH44wA4WsO9XVJeKW0fKPfimdxZu6xL8NXYXQqxV8pQIxBMGv/KSBgVvOGEIeropUSklQRhU2uj4Oc23HvP+5P4qIx+qdhXKRWeJ2qvmSPmxJfcQ= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1455; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1455; 31:sF/+D1GyptrdLc8nFmYPDhrXxrN+niW0/jM+biUK2VWJ2rUQ3p2roPO+RIre/+SirQ656jgUfyaFQrswnK9alfPutLdcv7qmE1Rv27ld+eAgW6a2yxU7jrMWzdmKSlZCQp4VtrP16XbUpyfMpwOrcHkoQJ0E2OLwjWGyAf57lNusXu3OPTyBTa/kOf7HL5/P1u89M7ZOHjlJHFWIEwkdmAuMiGwCE8IZYREaOZ6B23Q=; 20:ydsLXA09MG+tvTI+3VTClTha60p0C9ifBnRkSGIUlC6FA4Ao65gi5zRRkUI8Y87hNt/U1Aw0CM7ITn1+qOAAtj7tIjs42uracU1UzhcZtSkTShT+TyMD7dv4U70CwRY2Ya22thulyegL7cnnBh3K5cWQy0WPo2qTKCwV54g0cXptWuqXwnhVzqID/zcrZ9WxV63cJIPGoEuqI33GjWu/Ykbeq27LkddL0muwekax5Q90alu5mpZ7amt2H79CjerHLEzQT/DWH8Wqm6355QijG9t2d38Brxtq7u5B79o55k2j7Oz3ysOVRFG18bbr+nmvcChTwUvZWyjvD178QpnYvA3D49KqGzAtRrQDfxLpD2AHi/e+E2Vpo076Ei6O9APFoX09CbgNYQqEv2S0MkjDsSZiEDxTZo2JaNUwkmM1xzrbOJfme3Hsszwh9rMW0BEBkuOMAiiMm8EpUh4M3R4/73pB1dwEGD0Sy4zn4VamuhcovaNNVQroUZm9U7ty0N9/ 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:1tVCjZzUmxeIPjl+4VZhjUSq4vuR8/1C9/Ua0dKQTnGsl5u8ZJ4ammsue3lu3Hl6Plw3r40dza6UZFnFXYJmEnA66wkIsL2lOnIPdOIQR5r/nEqhsf+A3AxRRqmsJEh/QtSjS8MHluWK3l9fMUvuqxiYOhk+N5W7tKSm1UEe4/8cKoqtNUpLqGA6KvwJ+eyjnFRlZoOeGGtWnR9YlVj+EI/jmJkeFtPeucr3T0zqfb0JVTJfu32Eu69SsGIaAinXalthtnUfePhH9vEIPicCV2nRBRwJD8G7MZSSTmPHpDCQGgVpjurwDN/3aJQ8Cbrhj4bYNa6p6S9uEnq8Lzv8uX908rHcr1HBLHnHGnmEK8KNSzM5VHqoHHIw5U5lanv0AG/RhvS3fw+6pFLQnGQvxQ== X-Forefront-PRVS: 0029F17A3F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(4001350100001)(19580395003)(19580405001)(229853001)(105586002)(47776003)(8676002)(54356999)(23726003)(76176999)(50986999)(101416001)(81156014)(81166006)(77096005)(4326007)(33646002)(36756003)(66066001)(7846002)(2950100001)(50466002)(86362001)(575784001)(305945005)(53416004)(92566002)(7736002)(586003)(83506001)(42186005)(3846002)(6116002)(69596002)(110136002)(46406003)(2906002)(189998001)(68736007)(106356001)(97736004)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1455; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1455; 23:7pXRVoV1swGJSQ/gRBnJ2PWFga1RyNLHxTxvDMz?= =?us-ascii?Q?drEdl8p9R/cFdc4QX7rUgvPjs8G3brnYgH208PmFKbCE1d71gkiIzEteJm6P?= =?us-ascii?Q?0bx2RqhsFBwFKgXe3ePiHfmXmBfWOzp7Tryn/CwVjIbO2FTMpISCaUn/V4KR?= =?us-ascii?Q?6sswywA1rPKoVt5yH/Nrs9E8o2NbcDiGYyCEINkwJzEsw6WHTLW0U0MH0PUt?= =?us-ascii?Q?DYaXnwhBp/b6Ni9cgM8jTejgE3pWXuMeL9LeRIEM3bfgPxSqxSvt5ebtgunq?= =?us-ascii?Q?k1d/p4EmRY2gWMfPJztbryZsMLgj3OQg4On5uF/8DKpsxl2l0w5QgAJHpGET?= =?us-ascii?Q?3pySiPssHtQbq3ssHUbdu4tqXiuHkcp4ersXLAZZLwl7ZWELv2pTmQ7iGXGS?= =?us-ascii?Q?8rHTfues4XqY5As9shujaVNw1VYwkxnj00INnEfQfcFDIziGKmIWl0BDsMEK?= =?us-ascii?Q?4TecW7i4FWyhFQ20aoqhQQZoaDu/4drJ0KVQ9HetCYMlyUOwngczjCAY0ZyE?= =?us-ascii?Q?K0eWye9DdiJyqcKlETf/HKtA6BL0uEKm3R0dCBp3gQV0bpuQsZNQ8kSSTBkn?= =?us-ascii?Q?17aoz9Qs7WUm9NFzW/lQ4ino0raJF/lS/B3yJ/Pbk3CvRBYeJI3d1ihZNEh8?= =?us-ascii?Q?7M0CKSskci1GvdCttQEOJ809o71zh7wG0TQdQtDFtva5rkFxHHx10KDdSBBE?= =?us-ascii?Q?CxOb3aSbT2Ce30lpuLA6+hAJu3aZBLR4QB9/9n6r4F1/5Z0C/xVCmNWd8bQ1?= =?us-ascii?Q?XKmpmiKrsTVaovjxxA0zauvMhYPDQi1xGY1ti2bSlUuXEiSuDD8BmFLAaw5J?= =?us-ascii?Q?wMmAMT8vpetEfyf22lLXGkVDrQa9L0YFvjf7nfp702Qij7zU4+/sQ/YaROmC?= =?us-ascii?Q?tlmOs8zH+hwdb6ZTUmGvDG4T8AZZxXiyYFw/iB/x2BWpD5iBitUQ11PYbG5O?= =?us-ascii?Q?56t/A7XYblLJCsu9VrfyRf75NAvvGAAlBoKXREdgS3Hw5px/lOk9DNCha377?= =?us-ascii?Q?3yTjUTfHNPWDdQ1s2KAHMXAcZcfOtzAlv3qRtHDvFg+PvH4Dwt3doSPYl4x2?= =?us-ascii?Q?F0BuzBlMB2/V3q4TKyvYkloVdZTa/6WtXHuudBf3mvwtQ1jMZuMBrxFlssjo?= =?us-ascii?Q?hL9yNrXRHXO2pYmeiZd021v2Ten+KNKIn40JdSF47m2wPeMedBbjqmfZRwG4?= =?us-ascii?Q?MufTEr5CCZ22FiFI=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1455; 6:yml9YO7diSm/0YWLn4vbdVS7bX6kV1x+ywFCqICPLe7dVJ/T1iOEbXSIbRwcjZlZcN21NMo3sUKT2y3Quc4P7vW1hGGu7aBSDjOdYFYAWYA1TlskIK71VkCbEtNQxVJw2H1URTHdIlFyHgBjw67s18ac0z+ZwMMdnQFdMLFldqZIPaMiXSGhhEQLZvtxJld+B/HGpnjfjW/rwcv1LPaCm7Khu5OGRAuI9tLegcuwUR8K2gREDg3Ms81eZNVq4R2G3x+CFhJk0uQkQKpxDMG7mv6slFVgeMkande4uSzA4hOYUB26+BCmU1D4v9rqGPGo159OiON7E/AKucQwAjBU8A==; 5:tKQFgyoR3nwtMKt0dZrdvJiNfwxzFkckaxzlHaQglkbnXgnRJDcJxLGZsBd1fPyPBswfwXN2Sgxe79XoUDqEs4xTSuznFJzW6e5z4H9p9iGC8vkLnYffR76j4/YvCvGbVG9I6wUtmr8VEtV5gFSLuA==; 24:Hwn10gL/QQcIRJXEiBFFoYv5CJ0PpjJ6a5mifmJgOiz09TusK1P2gUWwsBnzGupcvRSO7oS6HphH8bNGOd8DrRcf+E1JT6bO5zkzbdbTY/c=; 7:aTuAo+Blgc5QvcCM5tz3yg/cJA0++eJdFEMVS5f9BBFplpEpbaVRTs7x81e9nQBsT5zPU4Dmnx0vzd/fwQ/nhMm8YJwIxNQAxwBy2up5agz5ZvjzPwAp+yLAA7IeQvb098xi1uEFU3Vug3B/Y0lr71QjMB5ByUR//DhwqUzGOb2CVMVf7w785VoWMy0cfLhCSB0/42/P+YDZ5zREm8DXJ8mbSgBMRXD0BAsSsXgSi7nbdh0UZsmv8lGkK6s1r8YF SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1455; 20:xkkMRWn2bjEzf1wYcDknOpr5V0Zjuns//0VCMnfpFdWcWEisRzWB7V/15rrhCtpgUZ1sTtgWoAWtLzAesW6YfMJcWQrVUUXWCmEBRyfqqw9uNaL3VP+mhUPE+VXWgFQDNY5rPK/3IfAVQw1NzDD4xlirmB926NKThxtFBdlHUrQ= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2016 05:10:58.5971 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1455 Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 038/127] ASoC: use component probe/remove on cs4271 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/cs4271.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c index 8c0f3b8..5f2673b 100644 --- a/sound/soc/codecs/cs4271.c +++ b/sound/soc/codecs/cs4271.c @@ -567,8 +567,9 @@ MODULE_DEVICE_TABLE(of, cs4271_dt_ids); EXPORT_SYMBOL_GPL(cs4271_dt_ids); #endif -static int cs4271_codec_probe(struct snd_soc_codec *codec) +static int cs4271_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); struct cs4271_platform_data *cs4271plat = codec->dev->platform_data; int ret; @@ -625,8 +626,9 @@ static int cs4271_codec_probe(struct snd_soc_codec *codec) return 0; } -static int cs4271_codec_remove(struct snd_soc_codec *codec) +static void cs4271_codec_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec); if (gpio_is_valid(cs4271->gpio_nreset)) @@ -635,17 +637,15 @@ static int cs4271_codec_remove(struct snd_soc_codec *codec) regcache_mark_dirty(cs4271->regmap); regulator_bulk_disable(ARRAY_SIZE(cs4271->supplies), cs4271->supplies); - - return 0; }; static struct snd_soc_codec_driver soc_codec_dev_cs4271 = { - .probe = cs4271_codec_probe, - .remove = cs4271_codec_remove, .suspend = cs4271_soc_suspend, .resume = cs4271_soc_resume, .component_driver = { + .probe = cs4271_codec_probe, + .remove = cs4271_codec_remove, .controls = cs4271_snd_controls, .num_controls = ARRAY_SIZE(cs4271_snd_controls), .dapm_widgets = cs4271_dapm_widgets,