From patchwork Mon Aug 8 09:24:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267387 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 528D0607D6 for ; Mon, 8 Aug 2016 09:24:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 406002679B for ; Mon, 8 Aug 2016 09:24:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3297B271BC; Mon, 8 Aug 2016 09:24:51 +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 BA51C2679B for ; Mon, 8 Aug 2016 09:24:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751259AbcHHJYu (ORCPT ); Mon, 8 Aug 2016 05:24:50 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:35327 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751158AbcHHJYt (ORCPT ); Mon, 8 Aug 2016 05:24:49 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:24:48 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 3FAA152579; Mon, 8 Aug 2016 18:24:48 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 35CE12806E; Mon, 8 Aug 2016 18:24:48 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 3095E2806D; Mon, 8 Aug 2016 18:24:48 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id UAB17749; Mon, 8 Aug 2016 18:24:48 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217447827" Received: from mail-hk2apc01lp0215.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.215]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:24:47 +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=soNSs+A2FmqCD4DpTXIiIiLsitngh7VjG04+b+lfUL8=; b=bXxUtrRwpGdnZHdnDODdsKON33z345ESv1DSeOkzeXc4pHJLZIrqr9ZVnINjzeiWNG3NlaHEh+NTbB4Xdc6WvZ4O3hv9NJ0T7Q8MWePjjYnHBLu+Xi10M3XXNQgxwW2y+PQTqtf5p7s7thH5mjsr4JJyTOwBN6d9gUbp5+lU4g4= 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:24:44 +0000 Message-ID: <874m6v39iz.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 120/159] ASoC: codec duplicated callback function goes to component on ssm2518 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:24:44 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TYXPR01CA0010.jpnprd01.prod.outlook.com (10.168.40.20) To PS1PR0601MB1450.apcprd06.prod.outlook.com (10.165.210.154) X-MS-Office365-Filtering-Correlation-Id: f22a9fbe-4b29-4594-a7fe-08d3bf6dd599 X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 2:mBZQrGp07I2usDxkpI5DcjlUdBCV5c2F2eZBYfCosK2DdyvVZj63mrcVRL87+7BnAWT/IIv3MYJjDDwHFQovXFn0ZuxD4pyKp7HnPYJ2IbJjbD55I2vQvGhrrocvZLTBRkfhtcVgI0X6WFnGHAFsGmNjC1LZ2NDhQJDCwUx9hqsLDcu4CP0QGymFU90ujzFg; 3:bwAinMQlS6uQXE8fO5hL4+3NwonBTG1nncL/ykZAeDqXkiiwikToCM3cCzLJsNTv1BXTJdkHhQ36pH71xqyzZqDiiMOfFFRxNIM1DZM+skgEy1Hl2oXiLPf+AAYhR07B; 25:+fnuRT1P7wYe7Yllk5SZety6lzeJ2Pdgcbnhc6oJy9MFpErhpymmgmgiOfmnYsr06if0tRn3wZfaNjJzSxK8VtTIaqIRjMEOSkTn1X/aq//7Os1Wq/as2Cwc2/09vCJkeuj9uNeX6sp3KL71ORGM/+XjzrkhbjJ3pq/YJl/8gFGrSpw5r0KE9UPzX59Ld7n5E7VE6WFeN72RR/XwfomNIQJrKINoxx7yCTIPF07Agoo1hBJyBEUVGwVbGpeDDUWBK0D46Xq9KgtOZJ9rz+XakjuFSp71ZQ1ZwGfwZXUXeyR9nZ2qWvFPLZDSdO6P1uQbMV5OF8kKO5ZDgD7lkYrpPXu0sMzs26GUTXhadSYKzbKQtFZMwQZJJGgAwrKudiS2eO/vwXJi8c3HnABwwHorvUY7JEZN4U31DADtf5TzuLw= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1450; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 31:f060dc1W2Pat1Pv+P3ERtjOMnUArr1YaKsYlVPaHntCV7wiZkzNMxi6z6ucNKNcAIOj/4RpcsdqydBSF4tDm9kP8O6ohOxqEsevTZ3ToTePD/zAlCWOgQ8nNUTelsksu+f8U9IHQVhXBI8UD6DQ8v1hskzFpykvQ/MyuXTG9d9eO9OmE0qPA5iqWcNpBN+ywVrfGJW+9lbxJpiikxi0uukRCKV2+o6Vd72cSAjxZWOs=; 20:6KLpw7ke9oMkeJN5RitCZScRJmzPqcsCKY65zLe8vZSMMtxHza1Yae0YOBahBHAbyzEAyC3csEwdBaGGwHBGmCOyddLAUWNXGX07wt+4WUam+i1A44ahbQZYb3jygU66AD0QbnZSWei29XrqRl3jWUuztpKPY7vbiLerG3guhBI1EHDGU1XyDyDmxW5GuW89m/h3O4TCBWeiIfqWu0fJuMiAe/5fl+Xc/bMcJ8AhIJCfEE6mmucbxRqdU8EC6yxvFNxP+V9FC6+e7z5YnJXF6GRSxI+XtWqUE0hpwlHoVTSzMNZVCHNJQgyeRA1Y6oX5kx51C94WiAUr56XsoGUGrPSZV2BgHnTFnq7FJIm7IVQJg49F5f4Cxe7B4n4dAEay9rFqilQQrGwZ78qi9FEoDZACmwSSMWPHpDY44ua0WPdwDsLpAz8pLhcjKFSw2EAk5TJiSYzhwwAqGsYhf9A43qp17qxS9BXiIsE2RvMz2l0z95GnvNCr+1NKnVKLkTT/ 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:AB1OXalBX8GbSF1uO/MARMh4ftTT7e2kbPBa9E55q3B9V9d9C+R0d3XobQC6c8SVDAflmYtiPlvvxQWop80vogksCBrlwwVruk3NK3++HcFhBOda71M24ndup/c3Ue7kvS9AjqvktS0XRsT3zB7GA/pk3FS2XNWAnFI4KwKtzD+sGJu1gSS52MpgcXPxbwTDANmM640sZrqMOB7pxAa15F9llqZWrmzuy6hzGA/tOYz6dHTKUbMAVs83R75Ac2bVq+D70dfrZC/gOl3ODh6XOviZoUq8fhj4eQxMTSKs1n9pmL1aM0ZgX4L7zm6jaDA08a7nRkDhuV8Eo5bG16fxVD9Ka1dPiW5hXJcApvI9R2RFaC6SqCOhH22yPyw6qp+PUYqda1YEKie7ErGY4O86Kw== 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:U5sYy1KCu/ykTXs7eJZpkp/l44576TxvwIAYsN8?= =?us-ascii?Q?V3KKWETu3vF8ycSCAAJhzp8NWYroSke/ceHRr+w38c7fN5KyTeHEfNRpyYrX?= =?us-ascii?Q?5cOrshQTobh0BAOwjHsld4oo6rp0vsRDUsyob1w0wSzQtfTjDJnK0h64wmKn?= =?us-ascii?Q?vKO0wEDZmrVjIKZI0xNxjtQRYEMw2T7ySCY5EDU3b7Q9AGSm5LFOf9y9C9g8?= =?us-ascii?Q?oFmkh5YENJBk9gTAgXhAtsFGA5tKZMk1JPpBUK0Tv4AzYLCLDh0XaUYXwsjc?= =?us-ascii?Q?n64DqR5AB/DyYKA6E5d303eUeNY64pD3PwBG8LszT5GsaBV9xzdMgFQmBvjn?= =?us-ascii?Q?K1hI6qUj9LP49hZinEa0q1WJPZCdUmB8CN70UEWH2xGq0WU//kJNVhQ81VOz?= =?us-ascii?Q?PZO3JNnypwAEHHoc8HEOO66GzFSD3WFdvZTm3a87/aKsYE9Hmzm9abgB2+Yp?= =?us-ascii?Q?iGypc4QFYanvM7JFmW3m9lXDNATLrVN12dujeWXgI3/S5g17lH2KBzCG51jt?= =?us-ascii?Q?yZNK2YGXUYkh+Nez5cQACfM57BB0dgHEya1WdITGh+HqGRqlvniuLqkPoUZT?= =?us-ascii?Q?4Sp5VO/02GxkFmvCb73ANvEwYC80SYp098EXTapVLSM8uJo/iOrfrhTsUdqi?= =?us-ascii?Q?bsYxCVOKArtGlasUJJF+pUbhZLUMoiiKOBt0nfGr2ouKxuP0vsVv+yaBrynt?= =?us-ascii?Q?qrLDgyycZYWELvidX2Wv5QbtdzlPLXe9abOV/J9/nhs8gkHrf7YUnG3nTZiK?= =?us-ascii?Q?7tvULCH0+Pgme0M7QaImoblpWX5NIM03YCZxIanpIznUuEwc7Wz9td6fzE7v?= =?us-ascii?Q?+FipxMQSHWnMLwj+CiYcPBd2Gr88/mKIpAUwP+x8ypLg799lIREsqkI7vuFY?= =?us-ascii?Q?Zi5eKx184pt5flUrYW7gyLluKkt2c6w6s1/eRPzGFRGDFwC+pAMpR+z/0Op6?= =?us-ascii?Q?5tJYwV/iC1WHnzfnqbsvgC6KI7iPGjZ9uJErRadr94m/jMsT5KSLhT8WNvRz?= =?us-ascii?Q?4UqjbEIyNMUKjQyEqNSUXCvyFXZaLm1X/tlYJhcn6tFco+Jhruaq+mvYNO8K?= =?us-ascii?Q?JXo2Oc2k6mpA62ANEpSncnZyk6HXyLyhKF8m/LQxlPhOUJwpKYbTAgEejQka?= =?us-ascii?Q?FpL5AwPSM5rNudqPxhMo803VY+aWPJJlF3FFR5FbnTehz+9L8UcNkP4lsvqj?= =?us-ascii?Q?8I+LzcFFRczpfe0w=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 6:yVRYGgiKGAMOIA4Hbkv2q9YUp4Ay4EWZHd4EmQqObTnZLbIAovIQP5D1DQrxgImwvAI59D5p3ym+HgD7YooLbEVdTHX7eNGtGmpBF3FCHjgbR90J06gcl5yFvSnss1qfHXddQJ/tyykf/xD7LFeGYIyCLz5ZJiohYyWFQKMsBvy3xR6KSylcPTyYwmwnEW8yPBGlTW+NlvSI448nS+S+Q7jND9jWqnIMGGwYH2TAd34jw5yYTGt+dqrySwWUVfvA8m3J+bAO9xpt/FoPWLVNK3XFSttHWWj2sCk2fZoM8vrIQMJIU8zdTp54+p8Ysvwqwvc/I+XoS3YpIhhm6GikRQ==; 5:ydg3ZSBi5CkAlXP3Ww8lEobRQnpiQe1QYcbZhfOw3Zwe7H651NUhv32J2RhK+66R2LbirHhgg6C+zhOLZ4GhY575nYsoKl1vxEIEpuFY2KeIDQTP9RZXvl9d92gZk3y0hgVAXYaZCD0eUWV+xRmuQw==; 24:4soOktguvLHGbLi5kcS6Kq9KNsB829cpefkZKyCmi/NnPivkex+fVxgQ1pC5BXHLS+EjKOSwke+o+6X/beyG8OjBN+fiLHtEbKqCkDhY/f8=; 7:UueCOVN2/ZKyQdir0LUXtTmvcXJ3YJJ+dcgqFmG5bR9Gj0gdtWBCy8fWOrCqEL8dOHbgidFnWxAyWAViHwoOzfXG091LDNepU1QVw3wcOsJMPNYcbJgK4DIVddzPabHmBY6y/SQ/oA97/ARfnquQM3gkazVh3yFkT5p7eLyEKCiTfZwEDw0kcsDCNLUQ8pt1r0hUOfnG2M0tiG1WvpLSyvIS05nx91QIHz2JhQGCTv2IXTFgTsXpuNQyR1QNKKQ4 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 20:y2RzQqCpSIXWsR+Mk8nU+k0ar8aFzvzMVHcU/BcoyPHzIvHFuf0nZ7Za5WHGiRkyT1WVRDkxW3zTgHn8ohF56VVhONcL+e7o6zE9voAjwmdVjPvah+IH7dQW9SBIxVWk8ZlyYC6tT0dDNE3Oy+6/5hE4NWk8JgVGYuhhYUwGt8E= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:24:44.1536 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1450 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/ssm2518.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/ssm2518.c b/sound/soc/codecs/ssm2518.c index e2e0bfa..38a85f3 100644 --- a/sound/soc/codecs/ssm2518.c +++ b/sound/soc/codecs/ssm2518.c @@ -715,12 +715,14 @@ static struct snd_soc_codec_driver ssm2518_codec_driver = { .set_sysclk = ssm2518_set_sysclk, .idle_bias_off = true, - .controls = ssm2518_snd_controls, - .num_controls = ARRAY_SIZE(ssm2518_snd_controls), - .dapm_widgets = ssm2518_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(ssm2518_dapm_widgets), - .dapm_routes = ssm2518_routes, - .num_dapm_routes = ARRAY_SIZE(ssm2518_routes), + .component_driver = { + .controls = ssm2518_snd_controls, + .num_controls = ARRAY_SIZE(ssm2518_snd_controls), + .dapm_widgets = ssm2518_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(ssm2518_dapm_widgets), + .dapm_routes = ssm2518_routes, + .num_dapm_routes = ARRAY_SIZE(ssm2518_routes), + }, }; static const struct regmap_config ssm2518_regmap_config = {