From patchwork Mon Aug 8 09:11: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: 9267209 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 D431E60754 for ; Mon, 8 Aug 2016 09:11:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C474026242 for ; Mon, 8 Aug 2016 09:11:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B9784271BC; Mon, 8 Aug 2016 09:11:25 +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 306CE26242 for ; Mon, 8 Aug 2016 09:11:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752008AbcHHJLZ (ORCPT ); Mon, 8 Aug 2016 05:11:25 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:36204 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751280AbcHHJLX (ORCPT ); Mon, 8 Aug 2016 05:11:23 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:11:22 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 7CEE04F265; Mon, 8 Aug 2016 18:11:22 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 7911E480A4; Mon, 8 Aug 2016 18:11:22 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 6906248014; Mon, 8 Aug 2016 18:11:22 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id UAY10205; Mon, 8 Aug 2016 18:11:22 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="217446737" Received: from mail-pu1apc01lp0015.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.15]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:11:21 +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=DT4Qqcx9VVtl2/etjicgGzD5WLpO44pifhV51LWleUE=; b=CIgKru/5XSL9dHPOk9B/HhE4hptiRztiX1gQ1Fp2ky46oxj2X8YEH5n6gtlScq0hfgPhyWAFh4H/j9dswoZ1M6bGmXVgN+8x3qOBjwzpplVRosXd7gpN7ZHSTOeBRyUG6SlZWy4v+XQiWzz8y58ZbJeSr6yHAfdhycvVXODcxFk= 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 HK2PR0601MB1441.apcprd06.prod.outlook.com (10.165.182.147) 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 09:11:18 +0000 Message-ID: <87vazb4opu.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 076/159] ASoC: codec duplicated callback function goes to component on adau1761 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 09:11:18 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS1PR01CA0020.jpnprd01.prod.outlook.com (10.161.225.158) To HK2PR0601MB1441.apcprd06.prod.outlook.com (10.165.182.147) X-MS-Office365-Filtering-Correlation-Id: bde02bb1-2dc1-45e1-61a4-08d3bf6bf5c9 X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 2:R/ak+UwGFoD6mKTAiCHsIqhY+/uOvjN2dbxTEcRsqhSK2wW2nfgu/uLPi8Xf1Y3K+Mg9Wxs90ypfzK/gXrPF7ATUj0aDt4c6r/wTb+BHgCXd15rdEV2jYjQIfIJKt3r2wCLfMSzCAJECsdQcDgDkFWa8TW4yQaWwHdRlQgD5xYr8yW5eLw6QokFDGuB/NjMo; 3:N7IW/x1gLNH3EvqXT1C6EmQypNs0of73L2DiGNLCITe6pyrlEcTz/2Ne2mpu4A62qPV3g+NnrFDxzDUwb3/16BfAcavGkaog+Z+GZ0rqQsjHtPWCVGW18VKvCVUHEZuC X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1441; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 25:VSXsI4I3iovnZ5GpTIQNcE/ctERX5GiNATXI0+nzNqIRjXR/NDhWRehmupYl+o9m4FENmUzR2oXmr57oHX0PpbFVT5FpMEUJGojtZs+/OIPi1FcSw6KCWDAp3sg2+HATnLnD442uBGyGCN7w4EpbEj4S+3m/c6bROVL04m/61Onj1E9naClLXBBIF4DBJeym2w05eP+9gYPkklyFCIz8xxzw0z62SjNANA9pSYahw6I4NEe9CU8ravtHIfxP5I+mAwNs8uTPB3aRKh5WtRm3Pw41lwaRVTXq5ULygyaMqHwEKog//kpqoVWhCd7x8bP9sepyk36pVz8WOH0tsVenA3zbexv+g7NOLlhPGCyrYa3x/EVjSS977Vtn0GZhCpbG2OEW/z6V8yV+FuGdoYNoHsmUZ8oz1li+EB4idRnCWKNYlGFknxTFxFwkU9ZfsjhB4605pnHAc8M7c2cAxycGunE3x/3qJh46u/qXaI3bCkQze7rA8TolJ9jgszKDw6kskG4OL0Ovyvcji+hv7P9kWhMV3c5dA3tV2vnru4zzAn/tCX6Nzskh5MGeISd7nuCGd1FeQf//2+prQQkri2VlibustSK4Y5jzTdNcdVYAIOH23605eG8NNNFakUBcZohWamYjskkSN78sDggifNnOyT7SEm8hsBtUEP0k7SjGLw+RFK+SucRthZjDJbTzGCixrW3c1Nsn7kCqsEQ9Ga5qUQ==; 31:F0+j8Q2APzhvXq2G9hXsZyY0aOIMfyXpbppmxHS6AZgvvRkgOpVawsSz3lq9Gh/TLpDA6VFCWOY1gG8fhhBSBTqvWWCJlufiOdyedZPWeu86hI2WSjZIKWXI+p+v1YZhpw6Ys58bpcIWrfD6zzY6fjAJiWHOp8mL2SzqBSWlyhR/gayOy/OjqgZzipWR7DTpJZrHY4F/9UP EO69biNokxkGj3ilX62g+E0sAxdDkaN8= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 20:wEouuo0LHPGWpdmsgf22xImorydywr840Y16fuz9Bt0aC5HzHVKjRnQRmJblgyFLZXC6DJINfDbQLlME7Fr634mMOdwdExhcRndO4SmxIXJ9kVZy038NNbaipoLJ1nVpFvcmWheYdgq8Qa609as52S3diqJP3RcN4tHLFBV9R52R1nCjj8w+VswPZZgAQjwPx4dy++5OMIuXOnW8HG7qxXDNvzeuXRW7ZMCLxwIWofFBVC7r694pZAcJ9ZgiL+rh5FaiAXOdJN74IzSST6oCYeu9bRl/Hg0F66SqbLNgrRAnf2+ro2Ni5/HLfIECjhw9x17xY175CldkKEIwDlJksbGkLLA69z3EwX1VTptSGcJanzcd3dTdkmJbE2415ZRWeoB6cB18+47wrtA5qied43fyaGAM9D92mxwdqPer8VegaL+BJaTPoLyCiQCDuKNZH/idkCd6HJv3EanIHlNwtaMrV9rvAjVUBp7bk031qYIh0UG4FFhlgR51YE/VVn7k; 4:ZCIUqZ2ZYXKWglp3nWY+fWZxJN10YDB9qrW8QjZN7IeG3TrfFbhhmYCB1lFCNcjc4dVtzfNenYwv0wvmQGrBriwX9o2L3bY0KPPr+bJPpd3XMfXYr53M1/Y7B5xtJO785jVEZX8wazHkJe9N0XsQa+gZmLp5stzoR1mk+CMwC21h43ZQUM63GE6Dk1qhvLA7dpQn2ivOV2MXfE7ZSfoLeAk2zQpEn8vtrbAaHjj+AJHkSmeeEylYm/GSVd3xwsLlzlSOwMLljoOIZwYavE1ASTbejX1arNU48D/y14MIQXCVt2Uf9hOBLCqunv+9EDHBA1emLTKii7dZQpbSq7DycHd2p5VMNa6cEI1MR4TqSolaWr4CpLl+DwxLHogr1HajoGNfDAhpjLNB5CgKTgvCNw== 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:HK2PR0601MB1441; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1441; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(68736007)(2906002)(46406003)(4326007)(33646002)(586003)(92566002)(86362001)(23726003)(36756003)(6116002)(101416001)(3846002)(7846002)(305945005)(97736004)(53416004)(110136002)(229853001)(4001350100001)(76176999)(105586002)(189998001)(54356999)(50986999)(42186005)(50466002)(19580395003)(47776003)(81156014)(19580405001)(69596002)(2950100001)(106356001)(83506001)(8676002)(66066001)(81166006)(77096005)(7736002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1441; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1441; 23:DVLBevxie84WdSQabTauu15pYVHIJibxZ9OXSff?= =?us-ascii?Q?T43/6EVVTte3uYrXuNKUgwavUAOOM73IeGQJukDyVMnUxtavqbR7giRUh7Dy?= =?us-ascii?Q?TmJjc9wVYWEEO/c8LCYHD7LqVExAblw+VJnVdN54xw5kCTgPkdyP4ehKBzUh?= =?us-ascii?Q?WGS24P7eghbDpiH8s57L2HYZz5hPotUaOquudHiBiwrpHBnDhUunRi4K9rPI?= =?us-ascii?Q?Y6oTJaO5OVTAbWagI7JQ0VcDZqX9UCou2VvOUOdrXsRBu9ZNMGMIrfL1kIxG?= =?us-ascii?Q?EVlGLSl772vQpbGqZcTWUpDtdI6diOYCyFhYh+Vf9NZgVzw5I2T37hmtF5Ox?= =?us-ascii?Q?VscQLwMi+Dgd/2yzFCu11Y2pgpnxuK4V7Oy6yG2+M8rSz4Tg+7pLe0gYfbs6?= =?us-ascii?Q?KtFMVt6u4GhckyN+e9mjDaddevv5N3XaIyUVZ2g0Io0N6bsnyWVDgnaXeVgW?= =?us-ascii?Q?60xjcu6P/3r0xD4axD/eB/jPWyIKpTou1BJXk4Jb/1zKGoNyhiDRM0zKgB3d?= =?us-ascii?Q?n8MnJ8maMjmm3GHk9Q+lichB00BruKg/+RrIKbJ0p4zX0FwBNLmcD4dVsnyB?= =?us-ascii?Q?qZnoq5hRmVTGBH2UPqlOvkYv53Kku0rY1YHzhx6TK0M7bfpx4pc8XCoId2Vn?= =?us-ascii?Q?ZOkQXTCy2JReMi72KGlPe7JxnO0G4IFs2b+HpdwHlJ6q4QWfctnlojAOq99R?= =?us-ascii?Q?ZC+G6NiCgzS+7dDL6Iq8JKXbExSiZt6IC+9Bolnmk+xJK92mC2nah9WKbmeS?= =?us-ascii?Q?F/t7WepvU+ojp+AU2Ygv0N62ZnXhmu01Yta5/Bwy5YuPbjNIAE1r4y68W6XX?= =?us-ascii?Q?ddY8mZBSWprqEUePLr3JV9UVTbRTO6iM76JLPAyXXFz6s5bQwpmUK5PB63ke?= =?us-ascii?Q?kwZSzn9MGZgB18+VZtDrUi575/5iHVkvU69nXN/cLmCOk8iQRLACZAA+MknN?= =?us-ascii?Q?OkRwrNMUK/SaIuz3uVG3dOWtpNfHuksm7idF5ctQurLFs+GjaJZo0UIMG9gJ?= =?us-ascii?Q?Y6dhgJbQZnUoQHNNpj1ej1402K+Adq2NBp03/ylIGVmtbbtDggiKm26luUAL?= =?us-ascii?Q?jiPFszm+gRQOkMVzJJFLkcoDMt3swzmp3Iwa9P7DR7yzNcgz1LAw0V5K78Hw?= =?us-ascii?Q?ZvnAHkkB8NWh6gnxjjTkhqFWrJCNWsg+Rd8+YYzDqlPZN9t7HlbqDNA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 6:VWU63HMhsdycXpOroV4E54VoFk0J9pEjV+u5VMiCb3T1/vffC6ccrcTDkzsECBxDAzXPRAti3At7JjCxNMgDl22HzZAzhZWRTBOjGCOyekDRFLT+3ZMyjZMJieyw7Hw09GFgtaD3o254nPU3lra5Mz3A8WTe4Iwwl0VECS890S7oAPogr0kHO8qcACDs5pYcgyF+1rBySjsHhkt3D+/ayYAzjgvWL01VmoEGxz29cKWDuZoCPY4ueQWyu5/WRHOG+jQ3afAU/UbsNO7bW67R+l7728dAPbJfk028OeS8//MZHTkHf80RakjsABPtjr67udeE4NLgZf5SQ/y0bEI/RQ==; 5:WGMWtb1rVAJlcJBknJwq0myofiHiD6WZ4T/q0rOXy89dOkLXPl/00hbyTwVt+u4SJyGenNdIS9qZCipaTqVC5eihO+YBYiqt0z0MoOwj6e7JHn6LpAVHIlYU9TzCEz26O1n3g14kdAyXOq5u1aAbng==; 24:JTU2ardizn9eYiSr//T8e4gVIYygrlthKvH4m+8n0x31C5JGCe6Pp13QtPvPc01VZ3PMwmEmNLMiUExDlmwaXzU+T233aqLii9UQxMxlKZc=; 7:CauMGTpFdMysqPotU264SLs0UvLVWStyoPzmGcaA1ZHxZUSBJhCIi01CdwvRijYeaVkXsxW7b6vPO5sOyQTdjWVVp8e6B2Eh3ZkFi4s5t4A04ibs2b8ZmFsNhp0BuI4MGkbodpWpZhrJzG8Z80yjncza6Cu1ZUBKrnnZ4gNYO3omH6M91kyvUsVb0VXUF9Vpx9WQjimfF5vjBXxS/kTeqBCO30wgUGfKXVBgzWnaEgR/q0QADURh4BhTY69J4o52 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 20:dWe5NLrl6opWNa3CLZ8UrpWP/fOiBSVeMcNTTBb5ErrK5S1n8IkDDz4xKMjoRxzD8vJ5tiY/DVmIWkdQarDyEXpxutLBATnzY7AXTUgUgsl6A+dKhzLwrOr1DArl6vBkSn17SS9/z6hQN6+EKjOjpnFIzNBOthD0vYDX7Qo2IrA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:11:18.9848 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1441 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/adau1761.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/adau1761.c b/sound/soc/codecs/adau1761.c index b95d29d..3bc3cc5 100644 --- a/sound/soc/codecs/adau1761.c +++ b/sound/soc/codecs/adau1761.c @@ -719,12 +719,14 @@ static const struct snd_soc_codec_driver adau1761_codec_driver = { .set_bias_level = adau1761_set_bias_level, .suspend_bias_off = true, - .controls = adau1761_controls, - .num_controls = ARRAY_SIZE(adau1761_controls), - .dapm_widgets = adau1x61_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(adau1x61_dapm_widgets), - .dapm_routes = adau1x61_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(adau1x61_dapm_routes), + .component_driver = { + .controls = adau1761_controls, + .num_controls = ARRAY_SIZE(adau1761_controls), + .dapm_widgets = adau1x61_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(adau1x61_dapm_widgets), + .dapm_routes = adau1x61_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(adau1x61_dapm_routes), + }, }; #define ADAU1761_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | \