From patchwork Mon Aug 8 09:14:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267245 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 303C060754 for ; Mon, 8 Aug 2016 09:14:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20A3F26242 for ; Mon, 8 Aug 2016 09:14:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 14F18271BC; Mon, 8 Aug 2016 09:14:29 +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 9A01626242 for ; Mon, 8 Aug 2016 09:14:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752159AbcHHJO2 (ORCPT ); Mon, 8 Aug 2016 05:14:28 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:63536 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752002AbcHHJO1 (ORCPT ); Mon, 8 Aug 2016 05:14:27 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 18:14:24 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 40DEA50EE4; Mon, 8 Aug 2016 18:14:23 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 3C93A18070; Mon, 8 Aug 2016 18:14:23 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 3796D1800A; Mon, 8 Aug 2016 18:14:23 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id UAN21974; Mon, 8 Aug 2016 18:14:23 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217446946" Received: from mail-pu1apc01lp0016.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.16]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:14:22 +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=PFnVYaXStVo3MEEH1wiqHTZhQRHqVmGcHaz1CLHPl10=; b=UWT/y1xvUA5VfevPcXdSq4eQkrdhVDmznvQWjJkh0zVbTChI/Icwx5KzUzF83nwBMchtNTyNv+vzpDGoJFoYzJrO+ejKJEy0WAf8Hx4CXTJg1oajuUZdvavyTm5x2OjBOCx8e50cY59d/Yr41eq/EvygAOzxvydTHMStRQWYprI= 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 KL1PR0601MB1445.apcprd06.prod.outlook.com (10.169.69.23) 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:14:19 +0000 Message-ID: <87h9av4okr.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 086/159] ASoC: codec duplicated callback function goes to component on cx20442 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:14:19 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR06CA0002.apcprd06.prod.outlook.com (10.164.91.12) To KL1PR0601MB1445.apcprd06.prod.outlook.com (10.169.69.23) X-MS-Office365-Filtering-Correlation-Id: 5e763e4e-7e0c-4f3d-8ed3-08d3bf6c6175 X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 2:8Yc3X8sNhYEM5LsSpkeEaV5sUuC7bNbCBAfEGXzCURj20tI18DErZoJ/0Tvc+EBZsUUjOt3LLaKrwMNrlMvrtwWkkFlrhW61szr25F4o6S8SdILzVN11jQ6aq71eAQTnNpJN4FHGY5qwTrAHcFFoDKCzMDgWDj7TGLepuuuFaFXKOboGEO2KQLWM4cQ6WCa0; 3:R/liOe4EU6ufc2Clnfw9v3LfQc+4U4Km/gkpq0UZIMZGyrlP5OY++AvtPLfER8YQKCPkbbex52dwccutoj1q/WwFOoScd8RnGI1t4jcd2QCmnkIVhK/6zowYTKx5seDA; 25:II7sXf1iAK2Gpg9YKtrXQnXKODWz1LvwVSCLCYzRhniRyacVOAv+A9TqCWXZlVeCyFKvGNBKhKcUzMPcN3SoPVlTDpSf7OYJDzVUEM7b1vK97BQMn8DQSA9XQ6kksSvTxsKb/W7UK5sGPE1XIN7XmAlG4rFoxlt7fAxtQB2lLpGjmuWjVWQBmRZJ1/rkJJ9KGgiSeHacMmowr/i9f1ALLoOdCpO+G95ioeYRRskrza+KQ/5MremQ/HEbipQupG9wMNqXPdhLrJP0c/qVHFHhiFrK27f7j78sQZVmsLrU8WakLyZ7CcM7DP73zypPpmhRtBZ0lfRNQca3hI1Mt96jeasiaPnqC/4Andzz7RA6FK34E2N5LBQYKXhx1BEIS5LC6edY5UsG4K6WTPpZ3S7CFbJWNEWB+k8L0Lozoq4jWjk= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:KL1PR0601MB1445; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 31:Gjy0N/F5MllhVSkEVs+9dF9h+xRUP12UDOlKJLPmMubyllV7AghOpPwxf9/f7BuDmY0ED2zQgMgT3dVdQy6MpVK8SAQosuO4tjruFoEZ3PwlkBJY+EiADTW0+QnWrO8PbxqTWQF1GuPQqiXlj3vqsEav/PapEeCcANzlXhrvuWHJ8QsUHbhz1QoLD47DwPbI0xAdcbAbOrWzbLG8mgQ5qDIX8S/yuP2j7RMZqxs1m8s=; 20:rigV9EFVhj9iekbeSxL6EAHlsu3uQXK33sG1HZicdaqqFk4BmSAIIK8LYlqWbV/USszIfEO6KEDv9phBLgHMWX+54POuQMcxSB7f89hQodZTdcLsBDtiKlvshUzoVuVxHYDNBGtGBdmxmoHWHcjM7f6juRz3ACpZlFNMcKd0XQv3/LuvdVaqG7Y2RwWWHgGmd730Q8One07wW777dbm2pDyUh+zpq5Mh28NO3b3GoTFCsYHudlUUOn3DzbMzqGDPQCd2Z6apfH3BbO9nj9QhpJHAPMnEX73I2VbPQMdxqHrnYux+5hcBX/puk4PfFGOVWzA6I2tUamkzZSp/AMWlutCiWe2mM5wcsqZkBBhViy/LKUBy3/fWf9jMRtuqwqFPwLOCeQLrIB/Gf/qGR2m9DIwAiuRFyetnpcE+2zfXCd7LeRxrP+j7TUtA/54WLW5eVS+1b8VipuiwEQkSxFqDdXACeLnK75QBGqVmhR/jS6pQN9Rm8f6yqxyzniF/7qbI 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:KL1PR0601MB1445; BCL:0; PCL:0; RULEID:; SRVR:KL1PR0601MB1445; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 4:Iup1jpj+bZtoc0Y6WxT5kgMO6gGDe/hXQriMwyXJ7ojsGQCSMTdxWW+CCqFn9TtkY96yNlFU3j8nwWrYcNv5wPKHVO5WUHOYsBz8jThRmeAQkoo4ptTmBLN+h/ot/qIII1hm/zmaoYQy1ksknIRHy5s2OLU0r7gAhlJPsQLmUlQiHP7BUBBpDQBDrk1gpUiT8ENgT5LWA/67S0w4CmIvd1kc/DK4I21ARaj5CdHqrnk01RDmY0UWBtjhRi439Y1K93CzLmATg+ASIkzaeTAeXTHqYgXnY0oP+G+XRO9CYHFDI+zJEHhCevC+pZDpxetqqsezxWT26MQwP5BBwFJ5SOchbna3OpwLctWGf4YnTGNtCr+wWQOwyYWfGuB74wAGKs12FfFY8sVjlZ3VHHkGSQ== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(81166006)(19580405001)(2950100001)(46406003)(50466002)(101416001)(19580395003)(33646002)(77096005)(69596002)(53416004)(8676002)(305945005)(54356999)(50986999)(47776003)(76176999)(83506001)(66066001)(81156014)(7736002)(7846002)(189998001)(2906002)(229853001)(3846002)(110136002)(86362001)(106356001)(68736007)(23726003)(36756003)(6116002)(586003)(4326007)(42186005)(105586002)(4001350100001)(97736004)(92566002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1445; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; KL1PR0601MB1445; 23:e4V+AT3dHNFCAFiBm56CJ2Y7AgylB0ndTOzJUAG?= =?us-ascii?Q?5eKLUbJsAQ9GZuzx9FPw71C0wHp7Nb+0miVkxUEtwTiqCCU/HI6ubHZpGMZY?= =?us-ascii?Q?Q2qnBxt78HY3Mzh6DR7AAYJmeMM9NNfcGLlw+T86FX35To/qUzyeLvtffRuT?= =?us-ascii?Q?gxVMY+OCH0QJO1NgTnn7+J2AEfJbYF8CUa6or/SlNvxgrgtgOvt8dbYWoV78?= =?us-ascii?Q?zhbmNG0j6mmDUZBBaOZFRHiZMXObHnzK33ec/kmwLqJVP+vkgwaU/xeDIZ3l?= =?us-ascii?Q?RMGuq/Ohqy15q9xSsMe0UUmsYlH6xq+buy/9hTkin/uqmYQDhfOD003Zn+sk?= =?us-ascii?Q?QOFPGmk8rN1xCpk0hSwu4fJO6O48Rflpq6mGqEU85xTPpLtyVml5qzBCg/vG?= =?us-ascii?Q?WysDwGARJsG3R2MjFbOjQaO2yCLNqe+o/eJQ3bx7VK/Fck1f8VPvKuCwbjvp?= =?us-ascii?Q?CueucZRo4V/uY24fdtudhTqlrinqBlUGLiaGexMpoak3KUr+Cbzd8NA97oHQ?= =?us-ascii?Q?iHRUC0w6OPNoW88G1pQkO89fO9mXMHEYNb5PIKnqDoVenbOiQrqov88xou1k?= =?us-ascii?Q?L0dKiCDNMS+bwa99anaZ8PiPMM3R5INpjFlw9quTmWTEFZQWlsIfjjjMYzm2?= =?us-ascii?Q?GcYBJ85XjaA5fl+GTGx4mQbagFwNWisiBmKqoWpLmJ7UN1XI8Uk0EZ3RrCqo?= =?us-ascii?Q?q+0f1XVBMmOTH8o9CDPVQtheBlN0QNFxqYa3hA9gM2e2ue8r63QDwN4ydrDf?= =?us-ascii?Q?rS2XrQpt9svUwYcglsUHr1V0RjUT/rmi0jmccChitZ1vI3cwQDHamEPct2G4?= =?us-ascii?Q?bF3H2H4JD+jR5b7pMjd1uRzWxHGeaVgFLOhNZVsZZOVVwPtBv4YBYG4XSfII?= =?us-ascii?Q?WaoHYhSUCsvrvacSnWFPCSfOhriguhw63WLBsdh/6/KszUPWD3CDAly11m0F?= =?us-ascii?Q?J1CXsgIbEMe22lekcfh6YPbBFDqtZcgBdRdW0LHXyVZoAaa8Ew3ZH1niLEm+?= =?us-ascii?Q?wpFxUGTLgpbFqSA+GZQgxJoNo7SxRFseaUUdNCV99JN5At8P+At4XWRnJ67j?= =?us-ascii?Q?Xb9Tj72INcotDCiK/ghEODe5ZlcdnEtkIZ3yT0LCmlyEsMphg032wYdF4Oo0?= =?us-ascii?Q?5Zp1fg2DAXrg5z4Tu/EVz9zbIfURBQZ6HFuwv3C7R6U3DJlx+Nw2tGQ=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 6:aHv8bwVHds/3aOhyY8X7wmOlm7HJO5zIi4yaYq5tr5ryyc/PpzgVqBF+cfSR8vJGLyOK4rk/mDdW6WruZqLihWR37idTp+b30mtlMqnRl8eCQ0HgiPN+65uaBlOPaFxbQZI7AxXaU/neRaJ6mT/YkI7Nts+ngNUVX56XsLcbUvs3/phHG1ETiMZOFpQzehQ7AqM2Rqdc9516IcMpEhuvuGeWmE0xm0+a7uU1ELzuqeKH2QpxRIyHniaLR/FRZ07ojFnKfaw6xyKO2Q4ozKZMJu9/MlUiDzMSwGjQPvMLVOBUeRkDbnAtF9K6E4IoDLuN1fs4nW/W+6eoXIXV4qWsbg==; 5:qQRHvDWdjCRPtM70fz0MjMw28F0xOTVmZXCSpip1pVQtNR5WTYC5rbYz46SqEhKMWgF77Sgj5rRnVclPLbq1FEP41c1+uhrbtublPCMHcsACfkB/dS3tMvxQSciudALC5y7RQkNACz1GmrdSdxwItQ==; 24:cvp3ytsS6OL3KJeIqbJ4Ovh4ckwtO96/AsOBfCQXDVkG9tbzV7b1/1RRH6d6RIDawnaM3DeyYs5jXXHx6TCrvV8lkxScQ9ZnLtZbS23u+t0=; 7:sQYF4SRzqPAvVmkTbkBC6dGgLa6KeizLXNrg8NZQHllsf9FXykOPA7fuJBEpPPjz8my16K0y3idSjiSB5ZwyrQ0zdc6vT85NWt2N5m922rEezs0kwhdoDbqnqcwku5E6+lWlZ4JKjzsp7bAb8PEwsiahf9rD6AvUj0R5/omMSI3luVZaBA9as1J8K48bVBFnGWb9WXJji+da88LN5u/3ApAjejr/0kKbkiw0yNq91tTGRNLEk32/B5AEx8nChYZp SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 20:6Knay2o8uS3LLgrKk8HGKPccuqslusdm1GZC/Ii6xa5ohkyz8OXoFzesV1AyctS20bJno6fzX0zxORuRRtd2VyZdOEoFqQS6U0q7LkO8szr+XNPduVOq/iWlOteTjarS+jjzHgbNeWQ43zKeapUJFfz40xocVVxhoEd7R0u59xI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:14:19.5994 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1445 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/cx20442.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/cx20442.c b/sound/soc/codecs/cx20442.c index fb3885f..2c12471 100644 --- a/sound/soc/codecs/cx20442.c +++ b/sound/soc/codecs/cx20442.c @@ -407,10 +407,12 @@ static struct snd_soc_codec_driver cx20442_codec_dev = { .reg_word_size = sizeof(u8), .read = cx20442_read_reg_cache, .write = cx20442_write, - .dapm_widgets = cx20442_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(cx20442_dapm_widgets), - .dapm_routes = cx20442_audio_map, - .num_dapm_routes = ARRAY_SIZE(cx20442_audio_map), + .component_driver = { + .dapm_widgets = cx20442_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(cx20442_dapm_widgets), + .dapm_routes = cx20442_audio_map, + .num_dapm_routes = ARRAY_SIZE(cx20442_audio_map), + }, }; static int cx20442_platform_probe(struct platform_device *pdev)