From patchwork Mon Aug 8 08:49:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9266993 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 C1BAB607D6 for ; Mon, 8 Aug 2016 08:49:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0AFE26220 for ; Mon, 8 Aug 2016 08:49:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A254C2793B; Mon, 8 Aug 2016 08:49:14 +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 15FD826220 for ; Mon, 8 Aug 2016 08:49:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751951AbcHHItN (ORCPT ); Mon, 8 Aug 2016 04:49:13 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:13681 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751259AbcHHItM (ORCPT ); Mon, 8 Aug 2016 04:49:12 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 17:49:06 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 6A00E50F5C; Mon, 8 Aug 2016 17:49:06 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 4F3F8480A4; Mon, 8 Aug 2016 17:49:06 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 4960548014; Mon, 8 Aug 2016 17:49:06 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id TAK01961; Mon, 8 Aug 2016 17:49:06 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217444726" Received: from mail-pu1apc01lp0020.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.20]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 17:49:05 +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=8DuOB2kaiC9eJCLdACROQorcIHkFv0V7j/u2NHW8bJM=; b=f1tRl5H1Kka7k4uMdFHQ7d+d4cmp5jJDCN62WeEJQKakhj8WWUy/Q3MtNP0s1ZKULQwtAmqTOAVgwFXWSPkAbPxTQbVxiH6NtvAQhPWrjyqhVsr6y8Y5/vKUaxDtvG4qi7yv2tS2JAPlYLb9TV3QhE3qtVtt/anZm1+XW+udzwQ= 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 HK2PR0601MB1444.apcprd06.prod.outlook.com (10.165.182.150) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.549.15; Mon, 8 Aug 2016 08:49:02 +0000 Message-ID: <87lh078xg9.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 008/159] ASoC: codec duplicated callback function goes to component on wm8776 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:49:02 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR0201CA0033.apcprd02.prod.outlook.com (10.164.90.171) To HK2PR0601MB1444.apcprd06.prod.outlook.com (10.165.182.150) X-MS-Office365-Filtering-Correlation-Id: 4b053f23-998e-4c7d-c82f-08d3bf68d8f5 X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 2:n/E/NiwuTJ/DyEpcB8FyOMAVOHKzbgNj7pmjB8KJ2v++7DWBH+sAQ2l2ZH6Hk/3xthKq6fcZF8gvdFqOj2UfJsHHQN9/YHd5JpVc6IRSb2WfxLcgpY7Vu28KovnMIVdz0Q/IyGpsAaz7wV58/gik0OYNntIXtCkxrCpv0hLAUcI1VXoStTzRu78QRmkCRPAa; 3:QaZ53TkgWl/0ziMCHOlDoDXh9vMRqgWmw+qU1O7zPvBMX8phLiWwrC2cAP52zndKeTakcWrcJV2nsat5YWPv1+jqfItEuqa0xLSYaX+lZsZnyqnhQarZvufKGr99AgO4; 25:3y+6syAqfXeQqh0/rZDFHC2UyGxr6POpBDU2rIiEQ6mNuCr02hUp03MTanSVYExZEHccXOIIH4cEW5ncdejXvroXWNci9+WZbwhYJUUwKkOQZ7vS0u+ogCnjNZ/PRSkLh4sKAkudQezCMBTu1JGMgDw9oFjq+Uq7FD9fwBRxPjuZxv46V2SMeV1Vt49DjOXHafpDbr61wukO+f6pXfOrknlU7Zol3njZMwSdrOwibbcobmzHjVWajCMsJ02xL6Ho5zPZsNZPeVBI6ukMphj9QddL5b3sy5c4lmpuyK0dADA8OQ7QN4CCzmBjhelVcTAmvX1QpQcodKyK4N0FhznbHSrda7jr/bQhx9YfAQiY68h4XWfnywHGy14r+03PBywxBOTM70+o+9Gn+DMjypblEXJwG13DHnHN52qzYxjlfk0= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1444; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 31:BUN4uqMutmojdiD8oZ2uDt8lURSMYbnfx+BSG7YF6uiUfbAN4gJiQ3W/kTUFlrrmYiSl57URbdlleA7CkIbkr6dqsU2Pd9++tfNHkxyDfumFEFSO79lBdFh95O413JgqZjkauXfvnunKGT5Qd+Kc4uc0lIErk1657JhvsWoGG1AMktvOBxNB9zXY6sy7O1VHmIIOU66aIuWuCMkmVGZyM/nmbdMxxNS38TmG71E6sgY=; 20:i+HFsrj5Y1jt9iJ8qHeCOzcxFGLesQfEslE7EOhnjWtR+0qSXoVxpGkAF9uLAsU0irEjtrY/tWEjgV4Rf5AwldfBxEwrJ4s32cAqv3qAgtjmMw5jMF8ErEMfaj6lipSm4HuCIy3D4oYijJaHotqBoMNEYLJt5f8gLFeLcn8OPXVun5nUAmP3VVoYEcU5zR7hh+S4xliaKKDDFXruI7TMeKaRcgfi1gdAv+0fRhy3uvCHMPPrhIfmvEbp/82o7rHZ10OTvqe7jGa7/CZ+ICv0AFdt3FqnrBC8oERBcddL6egd6cbkACQPawm3uxKoToNNoswjKZz/VWjn00s6Eva89Y9COhmtZLJLEEJphzjBZbWKcSSKyTH9lTkHBpKsjMSmElLzA4+6ZeGDBPNUBaNTMZEAZxXoooiC7b+N3GjpXWy02PdLDFkHe4nD0+AFCbEolNM1yZEhoaXAbTmBnxzNz96c98qAS0D79saqvttd17H5eY3JqniBjhiiBigaErSJ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6055026); SRVR:HK2PR0601MB1444; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1444; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 4:Ve1qhM+xpTkYJHBGXnp5zoI/H/ZpO3M3BxWnZokXtccRE05ARAonw5/QJTt5gvFj+5jD2PaEvbKt/JOsuKVh8Cv6q9jLf4qDvFX54ExNiPdAOD5zaxWkO5cLYUGK4NMTKZvWSwknA6WhtGCC6J5EPIUrMhcdhi1PrP8UdxS6v6GHY3FsHToi5qVfWvZSDV7kz/iAS5s4fHyfnD3OvDfzr3OaIu/OmBEQrOpPrbfFfUFJ2yQUAgdTABEvY4q2zR+e6o+W3Fof+pRvXd644vavrTWQmbkDhDCV+EhjvYvSZ7YvZQv5UcUqtTQf8CZlkkuPmrZoOk/yY5qWVtUAOWG4iUm+St5Tnw6rnxIY6zmOe8/irgU9YKjNn7vlMkL/KqubIxW5FWlz/nPGmV0FyXts8w== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(19580395003)(4326007)(19580405001)(92566002)(54356999)(69596002)(105586002)(76176999)(50986999)(83506001)(42186005)(33646002)(66066001)(6116002)(7846002)(2906002)(47776003)(3846002)(101416001)(8676002)(189998001)(86362001)(110136002)(81166006)(23726003)(81156014)(586003)(68736007)(46406003)(53416004)(36756003)(229853001)(106356001)(7736002)(2950100001)(4001350100001)(50466002)(77096005)(305945005)(97736004)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1444; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1444; 23:Y0nbHiW7UTvoy5K9yiueeniKIxHNQN+8jQ/J7EI?= =?us-ascii?Q?7KTARmmJEhb+3h8+ri3Bdot5m3m55SMZs1DDprOljQ8rEwr1Mp9AYC7vDBZH?= =?us-ascii?Q?6pDt4762vuxkAhAr8/XeQqwjFXFxzL+r02kW9kY9QCXSx0gsfwNFTIVDUbR/?= =?us-ascii?Q?6IwHM+yzWzQBGWNqKapedwcOSB2VKl0rDZYY7RKAxJFBuAxsFagXvGDu6CgE?= =?us-ascii?Q?WV6N7CBpVU7JKePHrmV6R16lVE/Z3QGIYvJA47w6Wj65L2d3DJd9hgy7Wim/?= =?us-ascii?Q?SBIfeNYgnFIB++NuIfvnAMxKvq5s4nkvZkCmhX4M3RoKn8KRK46S1nhlMYkR?= =?us-ascii?Q?k348qd+mMngBpCyJ2ltD5h1WQgLCbDrETiYwdA+ZaugsRszQTqA0NJMnHDyP?= =?us-ascii?Q?qHRFRDolu0cLqHHQI3Uol1Omgluz1ZVNv0+6/FAZlZfpYlp1mhcGm8xuAFBO?= =?us-ascii?Q?cXgHUYdoALPY6PDJ8+08bnfCK8F515oDrFYz+MtorWuQJ1VfvZVp1OMGaONp?= =?us-ascii?Q?L5P/OhMXVzUvLIenEXKEXw3/F7K5O6ikkYjPnqdJgGf0Ju9INvA1nzCbXSG3?= =?us-ascii?Q?eehWh//VALBToWXadogo2TACOuOgtKZnTgbwljE1nsD+1FLbm/qFhGyE1xfG?= =?us-ascii?Q?lCJC+C1XTN7W2im2j2uxNJrUi/4TzfkwDifabc1g1UfsMiC2OvqwKqtOKmmG?= =?us-ascii?Q?YJQ7YApM99E40uxxcdUtkImur/5BzEsYXWHk0Pk7b9qzfjucdOs7B9ZZlOWZ?= =?us-ascii?Q?qZwLDo4JvQt1fboHkyRuleukeLZz90Pqk1z8EDHyvTcduL4Zfaw1erFCYEv3?= =?us-ascii?Q?MgRQY03XzhdpJ+vUizrFo9AkbiJHYuwOu8bFhFr1n62uN73veF6iDwjkCPBH?= =?us-ascii?Q?wG1R89Fv+ckJmjCx8eJNiguGYz1i8BaN0loIvUMhwlE0y9oZLqtbGugU+BuM?= =?us-ascii?Q?oE+rTu161YZCeJcbw48/iWOXyvZ5s7ULIicsuxl3eWbr/ncz2is1aRoR49oH?= =?us-ascii?Q?vJZ2GGb+OteWzq+GyTEroeVKvGg5mvxzKzT+eLGs2ix/PxqA+sMhEH8gz8j6?= =?us-ascii?Q?cKwDqQCm/ikMkmhbNhanINaU8o/0w/NVkcrp/iBU4Cz3ndwb08NB5RTT0JCm?= =?us-ascii?Q?m0EEDEmSz8cMgZXAPLlaVneG9T8RkQQuPncPnmzTp3ebdtbs0fOVtqA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 6:dvDDxskR5nNlSiXzg9KMlfQwkFnbKVOqVW2EUCzCpj4Mne3i31kR465P/6OlDT352J5hT8Lm8Iyr9KRIM7r2fnjX5DKztuMREEPNeosJRLfY/ltbrXVOMUqajJRTO2L9D1BeOFyvgB5I9rnqY8/VmPeej2WS0dZR5nJgNpb9QIJda9SIXXOvwVt+dUx9S5hiHktyPl1R9Zl2bVFnIX+u3xBR+ohQA7TRRwau2JA4uoajOqLhN5QPaafoZPcbUzBaYKUNFLm/pVR8dArzyPgarHKf4F0cgvyEpEauADW8Y166izNpo2zf1QHZQCTy8hezEo29WDxKio8Ur1NqEdvtWw==; 5:LQ434QBEBOtaE9BIMEiYq9NkxvDYj/5iJK5GY0e0DdyPY5OJYYfA9K/zLnI0TKjpt40ZUY6N0FbKG0fOpweRogDId2tOXcfSFmmviQdEgTXJKXNo9OPfciQewQxD7hVg0D1iJC8yZTzvdxtqSOoEqw==; 24:rOlkzsEKX1rBRvFlp1miMZx93/HUtnF/NwZTkhEezMDAyi/QlG0dy8DOSo7erBOJJvo40xmcciGBrio1AFReKSaj2Bio04s+JbKWqNFPqB4=; 7:O4x8EmkjydPtF93S1PKz2xmMj4LBD1x/11cYEo8G3CaTiCD6fRN7To8gnYA2AqR6kCAOd+rtNf1jdfKicJS327sG3+9TPbgpr1hEoTRSX+lGWwnyahwnHRvgDa+jANrRQ3UFPaRCILa68aAM2y68gGzsLMa6bQbNM4zTBGX3jxjUDp9KZdQ59VTAAtDXY7Rn3h9V58VgXB8BtU2V/FYIP2Ie+LFsAEbXlCGXxFfPR+YSJ+HRMgLBy5NKZnum33oM SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 20:aWdsNH2tCbaAl+xL2aHciNqabd8zndhElAoYTteU5da6JA0bGYKOt+zNUMrtWxvIw2/OU3HBZt1lEPwT9lbM1aYY60V2Z6Ur2XbYJ7yAXORcRLis4YdhFKNDDLDhFQDnD3aDG6ryCtEuWZJEJiWIK29beYM/uguqcMUYU9Qp1+s= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 08:49:02.2328 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1444 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/wm8776.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm8776.c b/sound/soc/codecs/wm8776.c index 5af44f9..f17a3a8 100644 --- a/sound/soc/codecs/wm8776.c +++ b/sound/soc/codecs/wm8776.c @@ -430,12 +430,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8776 = { .set_bias_level = wm8776_set_bias_level, .suspend_bias_off = true, - .controls = wm8776_snd_controls, - .num_controls = ARRAY_SIZE(wm8776_snd_controls), - .dapm_widgets = wm8776_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8776_dapm_widgets), - .dapm_routes = routes, - .num_dapm_routes = ARRAY_SIZE(routes), + .component_driver = { + .controls = wm8776_snd_controls, + .num_controls = ARRAY_SIZE(wm8776_snd_controls), + .dapm_widgets = wm8776_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8776_dapm_widgets), + .dapm_routes = routes, + .num_dapm_routes = ARRAY_SIZE(routes), + }, }; static const struct of_device_id wm8776_of_match[] = {