From patchwork Mon Aug 8 08:47:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9266977 X-Patchwork-Delegate: geert@linux-m68k.org 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 87ACF607D6 for ; Mon, 8 Aug 2016 08:47:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 78C3126220 for ; Mon, 8 Aug 2016 08:47:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D502279B3; Mon, 8 Aug 2016 08:47:43 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D555F26220 for ; Mon, 8 Aug 2016 08:47:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751439AbcHHIrm (ORCPT ); Mon, 8 Aug 2016 04:47:42 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:16316 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750846AbcHHIrl (ORCPT ); Mon, 8 Aug 2016 04:47:41 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 17:47:39 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id DC1EA50454; Mon, 8 Aug 2016 17:47:39 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id C41848002E; Mon, 8 Aug 2016 17:47:39 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id BC14D8002D; Mon, 8 Aug 2016 17:47:39 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id TAM32044; Mon, 8 Aug 2016 17:47:39 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217444603" Received: from mail-sg2apc01lp0243.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.243]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 17:47:39 +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=244kh48URYBZrulXNjrieqIOtVXwS6B129S7olm4pi8=; b=XUVoUW4vy79TFYD4L0jQnggDwH4R1PoZrYd6GbhnjB/poh1fECIRVzst/83OsWaV84yxg3tetqVsKwjlSm5BydjcjgXZOMTZsG4klaNVseAjSlN64OURZkBsLOLeBOjSFijVwT6t+12Qi9/nNlkBoZgKlJ0/QQxMXuzUcPNf4IE= 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 SG2PR0601MB1454.apcprd06.prod.outlook.com (10.169.106.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.549.15; Mon, 8 Aug 2016 08:47:36 +0000 Message-ID: <87r39z8xin.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 004/159] ASoC: codec duplicated callback function goes to component on wm8978 User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown CC: Linux-ALSA , Liam Girdwood , Simon , In-Reply-To: <87wpjr8xld.wl%kuninori.morimoto.gx@renesas.com> References: <87wpjr8xld.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Mon, 8 Aug 2016 08:47:36 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: KAWPR01CA0022.jpnprd01.prod.outlook.com (10.161.24.32) To SG2PR0601MB1454.apcprd06.prod.outlook.com (10.169.106.20) X-MS-Office365-Filtering-Correlation-Id: 1a7bdf5a-2697-4bbf-9a22-08d3bf68a5e2 X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1454; 2:1peNpqVldsAh5K9n0nlkDfSt3bpciEMXzBrIayu6gpJnc58fJEA3ozloMPuY6mO36YJtJzaGY3m5YM9jJNrM+RIiV+ua1i+I60oYsjHboQatwOm8TQasWcWj43rE5sf/syx4BlpwGTT7wF0cXN2JQo8MtSoym/7wLc6QN8LM11NKDAzbQZlr/dSXOnGAzKMu; 3:2BRgiv+pNNYFYvlcUaBz7u4VRsAiacarbt8q+iLCPr3ezOsUFPijPmMnqw7f+cZqFaKZhVEgQ7wASQyqu33gC1/OZna1FUbadGt9nzTL2kdQiI40kBorGFaLa5z2ecd+; 25:T2p0o3tLdFQ+2YApLg4EiQ6lyIwBNZ0lYfDqOMWd/aKWuXdocEecIHj1X5Vy91u91whBGwfk+AvHjLd1sCvW4Vw6eTIR+F6asPRFUEXSXul2LV2oC93khv/RAsJmSzBtWf3Fzt9YXHq1xdUvahrAx5UIdkUo6KEjUhdCBnHvV5Vy5f2aw+fbZdVthC4Mbp59LzRucO+Jco7UTClgjgkCFVFL//syeYHpYPVHzfv90z6IcLpNJ5LO32+j2bCSmJK5nC/+BVlfuTh+yAqnPdlN/KL+tRxN3gx09M5ZL6tGuPl1q6hWN5/+0vyAPCudK2wf5gBHltCFAcNTTliGJnKiN/2qjjo2Eo9/Os0Z6/9LE+ps3KPHWeC5DgB0ZlZEG2LbhTFluhbPoGpG3NUE/6dIKfw9zj5Wp31dJj3sIx7cLu8= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1454; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1454; 31:iI5/+12GA+BNgj8+RoJa7BF2PqAB3nyZTCu16eYY7l/hxo8C5xerUO5odwmp4iVWLoNDPeQijZzIsunWVz72OUwmZnjHtG5PswNVUTCHpA1+K0yAAvJRvwvdC/cxh0pX4ObISpy2OZ1TnMt19aDXLHyRtctiaCYRrDS3I8ZnvNWKs5IyHMS+T9/pSPePbkMICqBk/FEay3/8aYUwIIAAFgUuEmnwxztMxahZFblmEcU=; 20:o+IWRhcIwVopjjmdY3gynBWBrl8Y0gXeilifC0DdQkC30uveY+2jpp1ft5MUE1u7B1arfX7Eh0rdjCfVYXEVLwREQQLsWEm1lzzKDnXd0zGUGEHY+6wsbqx/BNFzw09816A4hnj6Uk7tHlODxIa8+5bsKdMUwW8ayTZsaFNu/CC1iHGMm+qSBKjA+T4D75U37K+NTvLmS5Nu7U/AVjQunxkeYTEBcip5n87U/udctoN+gxy7DBWaWF0czt+uMpCh10nTKJVRvZ03SoIIjC2hwV4P2V+ApO2KHjz6j4DczWLiXFEPwZDls1DNv0DVq7a6oIgTMwWNQYtZfjT6KVzOEPEyTZIiRy57C5LJvxbyFO7C4H4kz5K0k/CvlNlobgxVYadifNeGXiaeUCNYHlBqa8RXpz9paz8sZTjhiFX1EJNAn1xPCK2U/WDT+BOJku9/8ogl3zgvCIwzCM1yy6mU6JHZTU6A8QcMB8IqzT171ReN4kOwpzqeQgKnVXtSBpow 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)(10201501046)(3002001)(6055026); SRVR:SG2PR0601MB1454; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1454; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1454; 4:m9p2NEGL0+Vs6r0+6rOfL7fNoRHUQhq5Pjiy8pu+vV+Fvki7PpCv7r7L28HyArzf2QJqf9cmu5GdyVimo2omBQrfnS/3wCALblRTrqsa2d8LsmYKve/IsUiMDtTR4g1R3yXUj2jI6itNZ9yiEu3wd6whN9YxSsZDUEv+S/Du1I5Bqr0KQlHJhreaDFGXKYZE8gplMFNW3+wJ1lcEA0g0vRd6zwdtwZLT7u8I3mx9sBNaNo04jv682Z7N0pNW823YeuGRba+QdMsI48z3rlevcCLiMtNxouDc7/cAi/POtY0blo3iCGEyjOb+5sSjVt+434GXcIduHjQq03DCcjdVNxeXvAQmlechPf4rP9otgEGdhW7xI+kFC5I2NQwhePF4LkbtZFVUzQMIEerXxb5CEw== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(54356999)(33646002)(46406003)(50986999)(76176999)(6116002)(3846002)(53416004)(105586002)(23726003)(4001350100001)(110136002)(36756003)(101416001)(189998001)(2906002)(42186005)(97736004)(8676002)(4326007)(19580405001)(69596002)(86362001)(106356001)(92566002)(305945005)(7846002)(7736002)(50466002)(68736007)(586003)(83506001)(77096005)(81166006)(81156014)(2950100001)(229853001)(66066001)(47776003)(19580395003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1454; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1454; 23:1yTbVZ7n5XKWg+0+rX3Eku8Ffr9a1HIUN/qyW7W?= =?us-ascii?Q?q4nzH++mfc22K4rgCNs/W/ZhOvvKDJw4oze7CwG8ojxXjaat1YQvtPEfXjey?= =?us-ascii?Q?AUOTg4DF86h6xwGH40gwKgNrK1sb+ynSgLNkmAu4ZKSOI4pSfJylVyz0UPWV?= =?us-ascii?Q?SJ1wrnn+wKKIixoqANZb0TZe02jgMDs2ZB+qGiLa1D6OSyFBvJ7sx/JGVltL?= =?us-ascii?Q?16CDLJ36JdBk13B+AUpl3NHMHb3uPgeh3BP7qgHhM6lt2vWVpnqKvX8L1v8A?= =?us-ascii?Q?x72hUYdkjOuTfaCsr3Apg1x6ZO96/0ikdNOItA+26fsb+dipQSyQj6vuwv+i?= =?us-ascii?Q?+Qt0+nNsrxm0dQud7aS2uBmZ+0TnvoeycusaahnNMUnFbJZgzTCdj7WRveFz?= =?us-ascii?Q?Gp3tiPnqcFELhlgLakGZsUf1x66ex5BHlD3lepOfojjwrg00lZ2UjpQWvZuQ?= =?us-ascii?Q?A1W+EY5+RIRk8qbqf6vES5V+PKbecFr0OsxEhBSjG49qIBfsIKkYn4G0QDj7?= =?us-ascii?Q?pxss8xAOWGSko9t2kff1EHrFTzi+pMbwDeEc3+cuxeR9xhghEznAWen54J8V?= =?us-ascii?Q?ZG8bZtZcSSedBQa+O+8Mu5OgH8oACWn5Ut6Nn3T8022F4vW43gSpWeSqhy1Q?= =?us-ascii?Q?gQT/IN2HyGf6KvO1l/RU/wcTB5PTypVXAwIaP/W722dC4Rj9wHpVw+1evQKu?= =?us-ascii?Q?Cav0YWaMP8GEka9GGrtfBmAi9aqP4Ry3dtaP0wlt2dg4St982bXOctXwWQ2V?= =?us-ascii?Q?Q3gqUFTGQGbQndlErycnIAO904RH5VCE/+vSskev7KYLVA9OPv3WCzpx4Pqa?= =?us-ascii?Q?XR7vg5REVJIi9jb4UaajQ5K61H0FY65N59gQK+EFN4Qtv806dhwf9paNM0ro?= =?us-ascii?Q?rrMPBGEmYhrKyH7SoUlasRBW4jarQjGFVlGejc2OySU2S5kH26O8wKoJLsgp?= =?us-ascii?Q?J0+WhG5zE7mhDeYKWD9TpEgD3nNmb8wGYiER1z3VkC/WEOlRyNCs7JngKnqC?= =?us-ascii?Q?DbUvOdOQeWCwwylA8rwu3gPYfb2RnyVg+c2+KP+Jx9ue8/mlZgylZiWaIv7V?= =?us-ascii?Q?sAqQz4RqgImM4QN55Za3kfePIpgwy4BOdMJctHw5gZHMv8pK8gercQzLQB1u?= =?us-ascii?Q?4gtIako1iG6zwfANzv8b3LlO+JS6aaywIlTc0tL/70OEiDcBP2VC4jw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1454; 6:J9XM8zRnlDTknbBW4PUJ1VxWtgtEl2qesdklqfuN8J3pHOvM4OKitLz2ZMC+fsuXS57El9ftIjDC/UCU2mTwORcXMzbcqXEjXoPYE6lJ8RIdkEIyD4lOJj8yH0JVLWkcBq8pvhyY7jEZN2yP6XTzjUkQ9pNY6HWtIJDsdTQzfRs7JBxBtla4tXRvomzVep/OHEqbqrFJbl+69sHlVlCUmLYY6XYGXNLy5p+tByv3zAXZT7xYARUl+ENWAlmgKLq68H+0GjbdGBqKNAXp4pUqTagfhNK6iAMdi3WSUavWRe81n26fWj8C0occrOT18yWoBpv+byY1NoUYqSKWAFvysg==; 5:ciCDnJw/8/prJM2j8rowLlz3swW14K0ABooFP1SmY0PDhkO1EPK69PLLbVOTbh7Zb/e0zT9onb5+BMAQ90yR24mfQLv825qftECSvZqz6kPNRu2bY4P6rUOv1BSb1E1CnGshDRTN3DdbHnVsd/7ToA==; 24:vzccqCWDzLPfuXGiPPDFg3fzyNu1B/5ZnNPW3GSwgsGShbYsasJ8AQwIILRpLkjDjiA01pnLSKm5/GwaDOYeFOyFKinCUPleFBz7p5uoVSo=; 7:5UAvobj+NMbGUm/EfMYJNNb1Xpmg5Daccqlg6e+MF5Fj7dWWetCZZmSEXn/l+YyOnzKCr5QDqZ4EDMqF1W9xws5kBFLkc5llwVeWZBkSQ8UDihOp7mMf8fiLXQHWSPVD+K9lLshIUPua15DeotnF9KHQVgihBtiR1wDZNwgecW50rFopZAOaKw8vkjiaenZy1R8ot2OxThNZvFqIPI0uZ3fMMKL8/evDPLbCpybiEaS58vob4id9OuZdjGWS9J1w SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1454; 20:H1K73typoAeRxv/Ix5H4ma4gHr5M9vZR30Ez+jSM+VuegL3Oives0Er/k5R2a210j9RHGBgeWK/ljAyPu3yzdGZ7MKUf+5Gk+dOOgI8RMyqZikzFEKbHw7tENH92wyv6c71Tx9ObT0EwMiK9RaP9pCIt7xac/+YbcsRso+Q2H9s= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 08:47:36.4198 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1454 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto codec driver and component driver has duplicated callback functions, and codec side functions are just copied to component side when register timing. This was quick-hack, but no longer needed. This patch moves these functions from codec driver to component driver. Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/wm8978.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index d36d600..910b36f 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c @@ -999,12 +999,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8978 = { .resume = wm8978_resume, .set_bias_level = wm8978_set_bias_level, - .controls = wm8978_snd_controls, - .num_controls = ARRAY_SIZE(wm8978_snd_controls), - .dapm_widgets = wm8978_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8978_dapm_widgets), - .dapm_routes = wm8978_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm8978_dapm_routes), + .component_driver = { + .controls = wm8978_snd_controls, + .num_controls = ARRAY_SIZE(wm8978_snd_controls), + .dapm_widgets = wm8978_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8978_dapm_widgets), + .dapm_routes = wm8978_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8978_dapm_routes), + }, }; static const struct regmap_config wm8978_regmap_config = {