From patchwork Mon Aug 8 09:28:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267879 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 805B6607D6 for ; Mon, 8 Aug 2016 11:02:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70B2127DCE for ; Mon, 8 Aug 2016 11:02:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 65B3C27FA9; Mon, 8 Aug 2016 11:02:21 +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 6C19227DCE for ; Mon, 8 Aug 2016 11:02:20 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id F3991268492; Mon, 8 Aug 2016 13:02:18 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 48CE3266DDD; Mon, 8 Aug 2016 12:03:35 +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 26844266DDD; Mon, 8 Aug 2016 12:03:34 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 3F56C267488 for ; Mon, 8 Aug 2016 11:29:04 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:29:03 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id D254A4FBFC; Mon, 8 Aug 2016 18:29:03 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id C34E61806F; Mon, 8 Aug 2016 18:29:03 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id BBAAD1800A; Mon, 8 Aug 2016 18:29:03 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id UAV28175; Mon, 8 Aug 2016 18:29:03 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="216938144" Received: from mail-hk2apc01lp0215.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.215]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:29:03 +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=oYhZw+uge7kounhysiiFxS3TIW2uwg/YCvp32YB0nG8=; b=hCKw5ZZHC0ucM7lhWdI16DPUQUbli7t5OsRrAHTv372GAfFRJt0u/ryk9zv+bk16qc1TRjLByIMQze75SFN+brlkSQQU3t8bBP3+8ask1rmZCxXKXMeM06hE5E3EH0YU5hulCOMEe9EXVigehnLGpJJDhW9zmlRIIYEVNPz2TLY= 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 PS1PR0601MB1450.apcprd06.prod.outlook.com (10.165.210.154) 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:28:59 +0000 Message-ID: <87k2fr1ure.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 09:28:59 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: KAWPR01CA0047.jpnprd01.prod.outlook.com (10.165.48.157) To PS1PR0601MB1450.apcprd06.prod.outlook.com (10.165.210.154) X-MS-Office365-Filtering-Correlation-Id: 195389ad-735b-4f2f-5214-08d3bf6e6e0e X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 2:sTCsK85VwzuZROSa375w1Dg9J2teGKp6R8CkkW35Th3D4isTIl0dtGS8vYrOUlKNlezb7EZqjAe5Bjdg3SPJlfmCP4qQBknEtthC4dWpqNQlxh6wpQqKh6+qG9K8TwSMt2xzk+OdOQijEs45qAzCEy7HOMlFRJiHI48ER4ZC/7bocGyawRk5idjhlFqbn5rJ; 3:vjq8vKP7mf4vety4rMHlFXDiFxp2uvF3E0K2JJ5MUHaNXJG72ucj8mv+lUq+BNWfIv6DllBg0GaHtbOEQsD8PqrDyStg9o1xl0eZ+NVoM/l2AfcJwWj55jSs5JWiLpeb; 25:c+GPmOTPTLGXY2ZBuDHJ/DOD0Sec0g8fj+jisMp0TEX0DZ1yLx1eEDCFDd/Vako8M2eCUSvYnFJIrQ1ZQNvgxltL5xj8LB0gLQxm+UvSofb7QIruyFXNSVmq03Tlp3Q/7XVz1QevoUmMPYzmBa5rnxdT+yIDmRdMZTtM/G7hMG/MPVcPALTGuz2PyAo0ipa+QPWI7CIDqBEVvjuFnXQJtm0jJQ9oWpOtuL03ANK7XXgfv6ZM3WiANYIezjfFdMQ59HrPN+xKvaYv/D+lhcWVXlK+VqXmNVsw93JQLm11d1zXO4gKXlccssSPCNGi8Fdm9p/ovyHI5lW1Xre6d/fO1KC5WRUmd0yCIj+/NEpG4Ds/KgopYIQh4A//J+U88fVFytbhjpO13kE29k1rNGxoE7CcRpnKfcB2ifkyArLgPIE= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1450; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 31:5as69eTX/vwNz20SS5BY96DV0/HhNBN0zCD4JtuHZeVJ/K/Z73z5GEn0t+NtE5oDs6yziblAi9nT9iT4RbdAIEq6TgHpe6qzNwZHw5KyiQisHYP+mior/naDqrL722ojQjNgAfwHf0R9FtdRv486Q5US55rZ5rA/loavpDhoOdkWuiyQrSOkY/hGqh96N9gk+q06qQR4q8jaqDMp2JMUv7BkO1okQSmMsYRzuj0VjRk=; 20:RbPOFcW7qSnrlHZkhAzlAdosWvtMFBLiOpqez9ro3b0NuqSBBt/mn5uqhPlXA4ErHu/l6PLEZaO1zqiVtwPQPWlhZ+Gx7jWUwTkoq0Rx4DpGJJcXNPhnSdLq8JGrWhn9lPF1CuyzBp3umlybbg0pILcgdMB3yRGivLTcWdXQg2ALw71rbTIGv0kF3zq0jWa6Ti3hQRkRTOgttEQO+t1+ZsByheGIfiCt83zJLMrTwqe5igjYh4l9iib8hn7U+MfnHkmtilybMr27ajXHYOxTBvYTq2Ncv0KLtHrM6oBb+HGwbcuFx3aVAW5wFGDzfzBd7Fh5KJqsa88epb9/i/p75/+VwWr1sIb37WJFJtKqmW4zSSlgTN94Y+u4dTa+F0kHhxkXsUoAcJHga7WK6CpGuQdspg78o+noAsslCnH8JQSCt+Q+pXtZ9Ei4Qhrsxk/+g/jZBGRCpZRCxoY+1tojoMXy08S9IlDN211GsuIsuXC3PwAytuwYS/gymCojIF/r 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)(3002001)(10201501046)(6055026); SRVR:PS1PR0601MB1450; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1450; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 4:62ZWb4kFcUAcq4BIwq+AbWs+AxvnfVNSAJ8UP25FAQl4ywprnP0CPhCypXCaCrW7X9O/KgzgIhSsU71hZ+kweSyAvHuVBQU70wzxDxa1oGeT3zCFoMmwALtsrOOE+BGfAkzESKdKFiMalR2u1JrT6aNRAHU8RnHom/Z+vaWMLbBQ97wJAFLa480ED5+auKVxV8wyV0RbGcO0qAVFixOo+vfaV99++dCUr2bTaSvXQFMefOH+BoS6VH74ew7bFGuphTYoJ+Z36OpS2oMeuTYPB2j9aqYIBchqD0hmnEaJvLPOZLHRVfSNlWevvgoCuoVNhwahV9H98XHx2lAekI0Bz339S8IwJS0Lo/+80k08W61jBkBGpIKvsk6Sb/P1Vovl9uY3733+/oa6TmipS1eHdQ== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(2950100001)(50466002)(4326007)(189998001)(4001350100001)(305945005)(23726003)(97736004)(7736002)(7846002)(3846002)(6116002)(8676002)(110136002)(105586002)(36756003)(586003)(68736007)(575784001)(92566002)(77096005)(229853001)(66066001)(81156014)(53416004)(86362001)(19580405001)(19580395003)(46406003)(50986999)(106356001)(69596002)(47776003)(2906002)(83506001)(101416001)(42186005)(54356999)(33646002)(81166006)(76176999)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1450; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1450; 23:II9NFU6bMeOrNasZz3O+MC2eJ1xpnu0y8rWz30y?= =?us-ascii?Q?CKyHz+x5P/+ykLsGloujyHTORnnmJ6OF8sMGCccdULy7+VEu1bi0/gONl8w/?= =?us-ascii?Q?eDZQSLArgHNomepdCeQIT2IdAH2hvrOQXVfb1d9SuhdfEfE+EakPRgKGCBul?= =?us-ascii?Q?zcJC8ADUnii4RYIkXQ2LLz0VJ3W+2ZVbt44OdT7xtDg40MrVfQL/RzR6NsRR?= =?us-ascii?Q?/jiJlhT1PYnfLgUKLQo3RHMrVfDJuCOO9oR5nbp+U7OAiPR8TPPRfydKxwp6?= =?us-ascii?Q?P4x72AQXuAVk0dmSvcdBUqDbRGhHoi+JLIXSZ3SPF2TNvE4pJijsQyllydEi?= =?us-ascii?Q?BoCa7YXVPUVifmA8ALxRzMVEFNhH9/XW19IT3GQwhw8ZWXyiC2p168hHkqDP?= =?us-ascii?Q?4/MHYDyc091BGdUFAxSOBXDr9nlMqEY1R+dJw2/9FRBmRZNeMDv6VEj0Q1JI?= =?us-ascii?Q?gCxOldy1EsJBrlQjzLySRDnRTtGiurPDdh/N/c7IzjyAPUJ3RfywMngUngUK?= =?us-ascii?Q?7j/+lQP/KlY3495ZJOCHNApkME3lRBYvu2XQrAvkMTtgCh1Im2b432WqB40O?= =?us-ascii?Q?hTg5EmYsfjtmVrsAfmTwKSZqAB3a1WoR3O94iAe/dXMUE/PdmyBtCPwuvQP3?= =?us-ascii?Q?pGtgO5FAANUX2tteUeoDR2xk8QaoO2G/h95/LDfwQHMjiLix2czRchaxCfwW?= =?us-ascii?Q?TSAcLyx0SbrZ0lnwM80x1ES/Kw1WiDCjL6DnNWRQTO51RjXYWJUuU1sW/KKM?= =?us-ascii?Q?O+AjiWICRvNWIfr0nBAvSLIpUY3IfuWm6F+4piyzWreELpHHcOfK7cQ2FcLJ?= =?us-ascii?Q?EmL3AHcozsI7P0Wp+snXka/DdIP72QAcXFFD1ISlME11FKIUfWbH4WcCU6K1?= =?us-ascii?Q?vizQ+/MXl4q32WLKW0fYvxnNPajpxP+9wWvL7Jm8Vlnxu9C21ra+tNR8D09Q?= =?us-ascii?Q?ujUS4eWD4DvbK7C9fd0Maaiu5BgrqAhfd4FAHqwne0cI8+Akw3cozHo64xaM?= =?us-ascii?Q?qYV64UJ3ssvarZXjXpm72gbDqrMW+JMCuVK0wJvgWf9lMpnXF7nQXdqRtrNs?= =?us-ascii?Q?DkvNE3Rf1hLRyZBq7QcItKY1cIVXctn4kTPglbxOIuwLY9Yw6AZqpZn7LeUY?= =?us-ascii?Q?/e5eXrcXkcVya8Waud8YQCmVbtL1gtA8saBPjHs7tWf7Jxex++7I7EcT9NFS?= =?us-ascii?Q?zdI0bC5Rir/BPITQ=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 6:SRCl5nsStotUmbPq1KlX95jB0mMdZ7a8OelUrkfZm/3G6zGHHgMtH4O/IJV+psfDj1Q6vTIL2ZOLA4E9O8vvKIcoAC6BuSg/dNlh3bEYvrIWMYjgt/zZqUPIvy7LP1Qswqj+aQVxhx7sUBoa3HBXqaay2r4rQobjkxU1VTtWEVBr1DHjIns24Vx+Qj1gp6NxBvfhQJh1cP4NHFtLF/z0+6Ho27tUdKctay1xbUUPWYMFfhgyggWGxohjCvqmybNfwnAZry2LralqQFUJMEqby9L1Mo3O1PZSS4KsYv7L5+HfK42aaiQuv6L2rXdKlKyozUYt72zLELm6j8V1txvr0w==; 5:LNGcAuWdFE8NL/IMX/DKcfS6cfE1sp1IHZgW0tI5TUmw0kLOsQZ8RcePszQscgK0XF99I97Py/NB6dydNPoHk5bDnTERWFePBiykPU9Ai4XlcpSwbXf4WF0Jry0Sqs/6auKuOgyOE+ZCNeVGr0j40Q==; 24:gcBHgH9I5+cZPm5qInfHccgJy6j5n52OOzXmXVTVTiCyvF3tlmkD/uwtAXq9IVu6D3a16ioeqCgH8YXs8hLaoBCxX1qi6IQzaVX+m+tqzM4=; 7:3pL7xPjzpebon7FKcLCR3OzUug4Ud+JrhBOAUvAwtJGkR4jfIblJtt7VZM2g/lcdHs6pp5DUJ8JRS79z6wwoMXH0kzDF/guUmipyiWcp462wkAyIdYNbQRrUpw8HXicBlB8rVKeLbk1qhIwSfMb60+yKSgnzz3MUQD/v5uUpXx/FKNsd+RYdiIpAMevs9DqR2ZPdv7ghp3xaj7xDvSW8QgUl4hREI5uOxb7N9iPMI+J2GyDm6JkVb+pl28kXjwRq SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 20:u1fNC+SPvn2CuU1XROLP+Y7/42RM7aYQ8wWJyG72Nb7akANdjnC2GWajGnNW+rh5n8RMQlB6TsPXS6A7mT3TNPXrNFYwyZcS/Q2cajxtQhDXqqtKKaGYA07wl8f5lAKImuIeFOSSvY9KN2HHFc3nOQ4ilb5jy7WMC82ges8nmQw= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:28:59.9458 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1450 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 134/159] ASoC: codec duplicated callback function goes to component on wm2200 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/wm2200.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index fd1439e..d913d0e 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -2111,12 +2111,14 @@ static struct snd_soc_codec_driver soc_codec_wm2200 = { .set_sysclk = wm2200_set_sysclk, .set_pll = wm2200_set_fll, - .controls = wm2200_snd_controls, - .num_controls = ARRAY_SIZE(wm2200_snd_controls), - .dapm_widgets = wm2200_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm2200_dapm_widgets), - .dapm_routes = wm2200_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm2200_dapm_routes), + .component_driver = { + .controls = wm2200_snd_controls, + .num_controls = ARRAY_SIZE(wm2200_snd_controls), + .dapm_widgets = wm2200_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm2200_dapm_widgets), + .dapm_routes = wm2200_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm2200_dapm_routes), + }, }; static irqreturn_t wm2200_irq(int irq, void *data)