From patchwork Mon Aug 8 08:48:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267029 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 B55BC60839 for ; Mon, 8 Aug 2016 08:53:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A56072621B for ; Mon, 8 Aug 2016 08:53:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 99F3A279B3; Mon, 8 Aug 2016 08:53:34 +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 9C0562621B for ; Mon, 8 Aug 2016 08:53:33 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id F22D6266AF1; Mon, 8 Aug 2016 10:53:31 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 416B1266B75; Mon, 8 Aug 2016 10:51:20 +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 4BFE3266B70; Mon, 8 Aug 2016 10:51:19 +0200 (CEST) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 7D3C1266B13 for ; Mon, 8 Aug 2016 10:48:48 +0200 (CEST) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 17:48:47 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 366AD50030; Mon, 8 Aug 2016 17:48:47 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 06C3F8002E; Mon, 8 Aug 2016 17:48:46 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id E0BF88002D; Mon, 8 Aug 2016 17:48:46 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac1.idc.renesas.com with ESMTP id TAA32596; Mon, 8 Aug 2016 17:48:46 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216934614" Received: from mail-sg2apc01lp0246.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.246]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 17:48:45 +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=4UrpNnjBkgybLSXdrmPdgxQ9Wl3nQPw56nz0CyLlAZQ=; b=bgDVSmyx3Bl7ooIgglNK2pgGgp3h6S2ReD05VEcncVOkWhu7y4Bg8BOhQE7nX7wFvs0vSVAILICL7v2uBv3XAJDDbdD528y8x6evScjwKnouGINEUe4f/Wa1WC8PVuZ1EDVKG8LKn3h7scbBeYhDVjGcM/90DQZ4gWOU+o21U6k= 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_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.549.15; Mon, 8 Aug 2016 08:48:42 +0000 Message-ID: <87mvkn8xgt.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: <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:48:42 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR06CA0020.apcprd06.prod.outlook.com (10.164.91.30) To HK2PR0601MB1444.apcprd06.prod.outlook.com (10.165.182.150) X-MS-Office365-Filtering-Correlation-Id: a912988f-b03d-48a9-d56c-08d3bf68cd73 X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 2:CwuyvmFjFV+VIIW+vYI3dUYVNmrztu6SR6/7rEu+1g52RQ6DbQb/T5eNikoBKpah+gCTM5uSDligi+biuvgyR2Fmj3rioVybfnA9KxdKmc3XP/orqkFYrGd7UBxaG4YZzdseSSk5DBMi7XkhAx02Lwlr9ciMx0UpfWF/lvmAdsMjKSDmIm2siFzvzF7XkrjN; 3:sI9R8meNhjQqsbfnyAy3ak0e/f3xMz0DYxebmDFNrnVIbfgK5rgOD8GTm7dcdG4ucS8H897vtXawaR/1JO+jiv8X7DNMafpq8GHLpIancpoQHkOFZ1GbrkLeN1Q4iDFW X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1444; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 25:d1x3OPos02lLtEansbqy/chKHsX88i6zEssPGElxSAvNnb0xtFwhV2BhoI3R1DcASoWLUyKbY/GGtT7K+RlorqyXTYxvtKMG8LAYTSoDr0Y9bgZZhMmC7DaRY3sREIi1LueAPNESfCTlj1/oICpu8blOyWaEobK+v5axxrbv57z5nI6hrb2hfIpjufJAgBrbcb1f0yg0n3matWjSiGDFXLbLQX+a5giIn1tCJOh3fQxGiTEdizQSGu7QJFseSoDJ4eJZ8Lzgk5quOdqQqo1B8Ic4Nu9P/m0AYcZ3OAPWQYTE86+JcdbWRmhudJxNINyet5h7GEPzTGWuaJuBbCIZ+EOiL4N4TuXh7VmkA70r4/KcmDhwTUefsrp0A1ZDGLVbkENafAEuaN5/OIDM+nV+thjnXVYlrnAQ+a9vDeUal9pHk255aHarsKVeLB2RPxMH+4MhLI7rZqgGumWBckVg+dLEKI9a39nWqTP9xkQ4vMRQ6j5AnAD3noAQBbo9R9/JHmtgjei+dmy8M/6lS5KF0aA9beblpACrg4MbQOef8jsa0d+z2nGG/nBk9zAVJ2Bcvg23fJrz5S1N2HSWkxC4XVZgrvOLBjroEkMArMVT9QiAB5M11qgdxtBC4a6W19SlpDZEkJXCE3UMfeo0ImkRo1d0WmXcTJSc5QYj54Movlvu3WSdvwBAF2zA3hiFl26o; 31:2ga3sW5dSEiEnm5lnvXpbiC2vcY04fh7lTrt5EYWyRIh1lkegaY8j4/8cqxcpgqSZwALHVBD5ySDW2/dAo/cuLI6qDxSI7MxAKARK/26o+W7DrVpSWExiSRmtxVneMPB3wc/XLRoHCB/fasO9scsY2NbAiZQhumy9Xxoeo3Kyxh1Vu3N9pRJs84XY4TMLotSjd88WA3P/MlMC4xt5PwUEYAIIU6uRZHO36M/VizePYk= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 20:NqIH+JLm/hJBS+xmOuj2ysiGz+Q+6Q0eNu/Q7zLh3Mxj1cIZZMtm/SmZABhn7y6qI/gblgrPAKgEKg1pOM8p4LPtkyKuj18cXTAbBpKYWCOZkyNfOyxm6E5kzSlonmkSvQn0CrpiRLsTNYuyFh3Swpc9A2nwVQbNXgVMOcbZpuyMj5LHh/ITax78vx2ySWRB7vPtPLy+YCWrj6mwpSJWF7G/HlAozX7XqwqY92DyD6vz5npKKmkWNAl9kUgptUBuiqWM3Ir3hYuTjYgBCuhpL42hdHYNBwGN+NS0JW96l7U6ZR1HC05nzpWPlzbKMqfzD71ftGo77ZMSn3wzdusl1xplBue3XP8mVbE/lvyOqqVEQqrTxw/VR1EsAI+aHiLX5xmSW3gI+hx78IL5bNDT2gCDh8hw3dJsmZjmYOYhLHL2lxjXZnv2auSeq/o6QAcw/Ik1mimtGWQMWRKxDk+WPQOHLWsUZCQ2aaqA4+TXOpnwn8IdpEAaJdfwKjxKDZ5F; 4:jE4G81zOMvQP9slV1iSmxiUQYcWC9jQj03z4iNSWyAXuHz3cbo195//shMtTohJneNuihf8Tgca3gFxBPhXqgHpSUU5e0sIwmyB3NVp6arDd7aJbWrK8hVtuU28YIKBLbNnuhfC0pxi6wWWd0EI6YKYXOW0kpcNJwsjXaTym65DqjQ/rPi9Ui0LbRFuyhS42ddLoPO9dQwXF/wtJp+J8m/LxyYcNaWSR3XAktI+nSLyLDfifopQp7Z6lJAAMpqwoCh3Jl33dKePu2EXsqWsToX+EfT4ZRSA2th4iVNtDBCaimybWA1L539NtPMYIKs4fRrfva/iYzvlrRtMdQcczIlcbkUItVf1ZWYqJ74ZVZNmxB2g/bk6N2rNCCshah3uTXBA914VEetnjYrRq5FOU/w== 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-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:2gIAoTdx5Kh/9t7rfK0OO2JrIG58oxWBScyOJ1+?= =?us-ascii?Q?OUO/GoOq1xpBMDgZpXinkO5I5TFaeCxuMH2OT9TyLz0pb+XqJ15P0nci4T7O?= =?us-ascii?Q?PmwjNNEafk+Cem+l6btuQwDBfR0+HAcD2nbnbEy7yyjzMbVp7cqAKZxgm/ML?= =?us-ascii?Q?YfZfWaXx0vFamBUbN63S3S3JKJ3PQdE6jdynA/DTAQT0KRcp+h8Vgo6Ps0gV?= =?us-ascii?Q?D0Jrx0t729LaPAQqcIqfOYHoItbW4yf98iSb9ofEuItpuR0NaOFm8Er+j0am?= =?us-ascii?Q?wU07E5NumOHlTI7Q0IW87BZxHEhsH2Q+32ReS4pGinZNPBNh/uCUoyriL6ni?= =?us-ascii?Q?1PwH9HAELRVd7Aa9QP/Jgd+R00BW3etZZhtniDSJY/gQv2bUIVclCaUDzSkI?= =?us-ascii?Q?wtCdv/Xv0ELDfOKUWx3Uu4P574m7GX0mAN2ucX7npierrqJNbZHcm/uPs5Ws?= =?us-ascii?Q?KH8JXk0+ldwPwgANN2bO8mQpjTGGSwwELekQFinHDM8CyeuXvQZTG7bi7VET?= =?us-ascii?Q?m6Lar6yXCgAk6iAt41ADoGdqXv9cjfPM/DQscNa5Tq0NOBwQfOdKfj7QaD5M?= =?us-ascii?Q?ghlwtyO784IEwEghbCmPlsNzAsiIOBT6dRo+rqcvhVEGm4L4Z9oN/MXCj/uW?= =?us-ascii?Q?5hM6RB0i/lpyErwgCvyxWy1qQeSuyhji8qVb1BEfpKVOMCWuNvdRjIlLyYLn?= =?us-ascii?Q?JHhlT51k37a1BIYOylsVKizmNTGyawhZnimzmFJhTex14sEkHykVsS7yJUSP?= =?us-ascii?Q?N8OagaTj/jAnXiw3yqEvWU1IfqyrzwG2kjSimgMNyNNp/YWwM1FHlP5k4TyG?= =?us-ascii?Q?QFrC9izZMYmjyxtEVjusRwI6rOihsXqEiLjH5SGm5EyY1/tfYq8Nqu+/RHt1?= =?us-ascii?Q?oKkK3hx2YJx1gU+2AwJOL+xk12nyJlML4AcweANzf4IZcSiMpQLZerqEA/12?= =?us-ascii?Q?pDYJpVtX6NRdn/pvQcSSRF5CaVqqtnMRp8OCetohJSLTEWb74exB9trHWcEw?= =?us-ascii?Q?Uy5Eag+haO05lq3IvqZ1OFnmVU5bDy2jgeAHePOyFq1zvvivCRPSkDWgNUU7?= =?us-ascii?Q?oOEP6/jjwqP+9zJJ2vqvoqrmqikuYfzouzkee1mRFi23qi8AZ0bN7rse9IPh?= =?us-ascii?Q?pcCpK0dcmnJcsPT5PkkDWJ+x2MvcqFU+4X1nTJVJGHLnR20Sjk40mJg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 6:K5WFEssljreKALx4dQi93Nal8uYrrsD28CmLlZVob1Sfk9jd7G5cqP4TILp7lzSHGUvDEZurQPrunkVDNKrVlFNI2o2LcOVrQv8GDjR005gxAaXetr+rDrkPtzbdcm2e814KZnYeWslJLKdC+1dRhHmhB+HdaJG1gSFowkaboG7Tcrk5U68VD/dZyLwNy3GamwI3VuqfiIOCONsqaDhhzZznF4Kq8xw/LN+LeGU99fmm6k3maOX3UCBhLnyhWfOab8iriY6lE+uBD009GSq9U2HoUX4CahpsHmWYzBwOyMDChoZm3KjJaV82mnkHQNjjBKEfjwUeFvU0RpXYHWmnGw==; 5:2tBe/+qwnUesr1q40xuTYgOGsu8zQb9kfkaxOyspvIDSUHTqIdE3layXaLEU/jgt8XnnttAZWG/fYG+S8ZBikfZD1P01oWWBYpA8j1TAjh1TTQ0FGC48Mq5skhrXaSezrbVQLpoMR4RTqk0lt/ho9w==; 24:KUPjpsAoAx63YaRHrRkhnDbjztENKGucUb/iCzJ97Y6PeauR7UObh5g2zwJi6fq+t/hv4tzSGsicOnZsKJpv+OjCaEj0tbo5vrOqG1n0csE=; 7:7n2QcjJuXfrXvGeiEC1AWiOeenciNTzRM96xoraM1sRFcQR80ZdyndohrF8CCFJIDK5tybRyNzFGNBEJTj9L/uZzGdxeurdCCVoLsG7T22+jIUScf8GtjZ88ZvquRgDh6dWJupVz+deWTq4h+sQItMvRBNe3y982yOjFe/pc08Ys8WoJzMGU3hvGUI17NTpeNOZO81/u9BRtD11T9NiK9dwnXZmr0v5LRabKJO/9WfIDoiBHCaE+oRf6OXdn6bnt SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 20:hgekmOFYr7W6LZFgl05AdQXqsJkD3tHRT56PtnGONMTG751382uCIv2svVGuXukU+xceHypkdwRvEiasENRSFz8ycu6V95GBWxLfBG6pw9T6Eysg/19ETOYxtKAoJ1mavRFbwXESUSAbq0rsv5p+8zMQxHgaQVMQP1ynGNjzRog= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 08:48:42.9182 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1444 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 007/159] ASoC: codec duplicated callback function goes to component on wm8804 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 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/wm8804.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index 8d91470..af95d648 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c @@ -545,10 +545,12 @@ static struct snd_soc_dai_driver wm8804_dai = { static const struct snd_soc_codec_driver soc_codec_dev_wm8804 = { .idle_bias_off = true, - .dapm_widgets = wm8804_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8804_dapm_widgets), - .dapm_routes = wm8804_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm8804_dapm_routes), + .component_driver = { + .dapm_widgets = wm8804_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8804_dapm_widgets), + .dapm_routes = wm8804_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8804_dapm_routes), + }, }; const struct regmap_config wm8804_regmap_config = {