From patchwork Mon Aug 8 09:21:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267337 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 D775F607D6 for ; Mon, 8 Aug 2016 09:21:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C81C327D5D for ; Mon, 8 Aug 2016 09:21:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BCE4127DCE; Mon, 8 Aug 2016 09:21:45 +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 5543D27D5D for ; Mon, 8 Aug 2016 09:21:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752447AbcHHJVo (ORCPT ); Mon, 8 Aug 2016 05:21:44 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:46012 "EHLO relmlie4.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752644AbcHHJVm (ORCPT ); Mon, 8 Aug 2016 05:21:42 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie4.idc.renesas.com with ESMTP; 08 Aug 2016 18:21:40 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id B8B1B4F7D1; Mon, 8 Aug 2016 18:21:40 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id B0B8B1806F; Mon, 8 Aug 2016 18:21:40 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id ACB371800A; Mon, 8 Aug 2016 18:21:40 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id UAN24977; Mon, 8 Aug 2016 18:21:40 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="216937641" Received: from mail-hk2apc01lp0211.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.211]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:21:39 +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=V+Jt63FILWT9rfAvggcEvvr1gOzzlIJMkNVksctIXCc=; b=ETUzNdS5rmleXZBno6fJcVp9bpDV/DCLns46vRpfTBP6FMtE+UWrX9rOkVfRKgt4pkTi9oKh/6Vrr7Ti58IkfRIpqjWG5TT53weWgdMXfhKhpplEfz0ebBhFhyYG2qnyLSbFBqas2kIm5HXisz9mlt3ENyVqpg1EgTioKVWZ+jE= 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 PS1PR0601MB1451.apcprd06.prod.outlook.com (10.165.210.155) 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:21:37 +0000 Message-ID: <87invb39o6.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 110/159] ASoC: codec duplicated callback function goes to component on rt298 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:21:37 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0072.jpnprd01.prod.outlook.com (10.165.51.160) To PS1PR0601MB1451.apcprd06.prod.outlook.com (10.165.210.155) X-MS-Office365-Filtering-Correlation-Id: f3f64508-2ea4-450c-6f0f-08d3bf6d6628 X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 2:aOatgf/GvJRlSONpzSuN+9pM6sD8m55zGz4t07zr4IAL5jEH3Y5dqxchDiIGwQR+cQMU7em66BiuQ9kSV1HVfarGfi0xWC8V2a7CFsByObuLcrNWd4BM4DkfCLJIa8rDoK8VPWc49LXblY3rwFnI7pXh3VclWb4xJO+k5D2edrbNdB5KPdf9hW0hBQSXzBnx; 3:A+eIJnQWv/uKZHK2CQhrxPLmh29uwCvCCnA7rrtQBC/wSFi39TAQYeNbelPFjqxM6057f0FoaN4LSjYY71oU7cpgO2ejlESFwzUb8yyRTHjDYPb0PbtQU7PS+732IYVq; 25:i7iV4xsK1IJ5fJLKUBFgmH3eggi6Y9IiZWkWQ/x+bfIqyXRqQJA4inxzx2wHkw/ZisIC1uFiGxK5lMyGpiLHIeITrDAI8mDnXoQWNyO4DSqnqfpM+SfHqMWKWs/4LZ20P3hOhcLQMX3wNBQgwBNCxRUBEcNd7SVsLYAaIiD/7+VDc4C79QE0vEASq9jY2+NnSPicoLN0vMKbQAEwg2AaoZbHijMYdF3oSZoNlHfQDCvH6ZmCbP3HMv5x9OEUr4Jo/L3MGWqAI23DcJrG3WdzusX1NknVWy3ebjnuIxEMeOaBqY7kBvG8G0vxWoGEgtRehW8WFRq3kTPO6y/v1JkAwzqFDI1jDpEv3udXcsykn0iR3/k3vLjvbnGWEo3I4AMOWTtbNDQPOXlH9J3uRAAVf3jENPlycGwExC486yPPcMU= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1451; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 31:ihlDLV9QqQ494KvFZCMMYodOKUN7sK9uLA1VWVMGGNI++zxFzcuMjHd7dxiZvyrMItasahasE1H8bnyXEReS7vHxHZfAzuQ/UyFBhmw+vswoom9bDN4ywdvoIBzTdBI+eTjm/N/y7qwEWSXN92jf4HhNPmZaRtUHo5p03jFr/NDqveRI4tpIKvdScaC16QBHI660ict8Q99jXH0TSqXJyNKd8WRKk5uhcrP5HgxsWgQ=; 20:g7QWq3nv/6b0RuV+0XBOUNulmQ2cTVjDZ/C2ZxsSgEfgvTiLiAlwztE0n1gWosMzcKIY0GjXA6FeADhMXuqKueAkxtaaI1gaYmWaneuQLVLjD8UibHxlAzrHUMQ38NQYkC5w6YXYux7jo1FBxeei1YmND3q1Cj4J8xY85/gxikhgy2USTvUbknfkIW8vbsJgwBo6I3BH2ozSCiaIQUBp0kEZAJ8d+RcOvCqq/qGvyhrzBofScMi4QViPrLgrGMbux6jTmmH4A4pBgNvR1VsF1DbfjFLfgK1AMLPUDy4GehXJIHOeQFpgvt5qFU85xpG8GYujyCYRUQyYukZ14aL/93nPmVYgnYvIAMUk31JzrMPuC5uhlq5IhyKgzjsjyDYNzRsovXUSNfYDj11yrsEi/FPkm7eWmlCpCHLp2IrRZRfcxcKHsiKdrk4YxPr081MH5zL/SQtng/kcwyCSmZuFyDSmiLmo//ocEnvVGOyTZmHcTSmrB/UDfoQyBAHKshBb 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)(10201501046)(3002001)(6055026); SRVR:PS1PR0601MB1451; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1451; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 4:Dcj9zh466uUp/0ynGZUeaSqK8JipjG9dRJFZDcSdJheZJh1xwCUk/T2Q0p2SeM++3rawcOF5vggqj+3OZo00idiX/JZtzUUZkZB7Q7cVZCmFzyGy6kOxTWkk57RRmbptWw7Q7kQLJ5anM57IjtoiiAnpMLnXI7NS3bxE2oVu9hIRUi3q9CXJKBbX5Aj652b2ypTnUJRdQS0H1AMZ2CnUaHpPDwNArOuC5wpEYJOaJFI3tNWjgKSmVGy+atF2deWNgqNGL+5YJ4DVTEIxS7fBLz2twPCautE8I1ORnmEFUatB+yFbxvQhkEp6qagXX8rl7sRC01COgDI+usCjDdgqE25XQi09CxauaOD5bha/AOF6pFkdR460JD5rjbWwXV7jb10+6bbWlqUsjGgB6gh3/A== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(33646002)(586003)(47776003)(97736004)(7736002)(54356999)(42186005)(106356001)(2950100001)(66066001)(86362001)(189998001)(76176999)(110136002)(50986999)(4326007)(305945005)(101416001)(7846002)(53416004)(92566002)(77096005)(19580395003)(229853001)(6116002)(50466002)(3846002)(19580405001)(69596002)(4001350100001)(105586002)(23726003)(81156014)(83506001)(68736007)(8676002)(36756003)(2906002)(46406003)(81166006)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1451; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1451; 23:1suec7B77E4AK8H1xUDuUNTWIgu3576ftRRtX22?= =?us-ascii?Q?5diJowCdRPTc4zadLtbdlWLWbKn7HneqiQTYorgRGdggq3fms2W5wKQ/Geou?= =?us-ascii?Q?08CxOhw9FA+t1b4b1bwGY0S7K/PK7S6eyoHC3LaCVVaiCFUCvI3nqnqNVM8N?= =?us-ascii?Q?GOKFk22gQmkv+qZm1zBW5hW2i2VE+T6+dZD9s7IdUxnnvwMnudDm3mLguFJe?= =?us-ascii?Q?Ov8RKO/Tjy9ZXl1vXRLvTsjwzKg8u1CqysFJ8lDcx4X8IXv7qovduAclxRwL?= =?us-ascii?Q?jMaMF7wt3n72EIWMU36sQW9ibjREc51wg7g6pMeB+VLJ1LgpPXGCWBiS2jr1?= =?us-ascii?Q?W79Xg3GXbUJ0X8BzIhZl/qSuQzl7O1z8plEY+FJ7VZZ3qRuD0HydvB/+r35c?= =?us-ascii?Q?LqOGLIccM7o2ypRixPcJ/LspaLEMx6jlnYwAytfvpkbo1M47GUf4xeM8RBZG?= =?us-ascii?Q?VYnbwJRbm59aooUVRSuUxEDOkLPaTEy9BqvkNOZHPj598a1N6XkR9enP68FJ?= =?us-ascii?Q?Vhbvfe9OtVLtzj1OpQ9Hjn6gLlwICFeJtXuQnv+fVsoPppNONhqx7DtRDBZb?= =?us-ascii?Q?cfxsdNy/36bRT/JclEtZTOQ2E46sV2VTFs3ScFmKSLGTRELdV3G7VC0QkmNT?= =?us-ascii?Q?71fY2nn3HOP7HWwLpwcnoUlFJ/0yAxe8uPVp7kr28RP/8AkaCIYlx/tOcbsk?= =?us-ascii?Q?tk8dfq9IeA28TM1GrbbgmPCf7lXsJgdHs9QNTinI3YT8pf2/dl3NTknx4uMf?= =?us-ascii?Q?Hvd19PEm1rs8DkOb3Cqi1mkLC+Z3rkQaJIE1wciEwv5MgnK2vr8KGjnh2YpG?= =?us-ascii?Q?XbJaya+/HkANi7FW3YTw6Hc1mYGoB7VROMJXtVv+nUxSA3kupAI48MFVL+CK?= =?us-ascii?Q?vabJ+XmgpwUyXdHHGc5tNePgxk58D7py53oecnEnV0IUYOj23eNMpbGQEnQ7?= =?us-ascii?Q?05HnVjZbaju1s+V4uJg4/NxwiqeVZOmfYn8s4prpTe0cZxY1ADJ+66qO7Wlm?= =?us-ascii?Q?l1ViEZsFZpqGg31IoXDUjD5uk/xQ6SYma5S8haur5G/TTOrnXPduVDlFQQpB?= =?us-ascii?Q?e47TyAgIVWNTLtWv1F9CcyzVxRzalj4I+eF6Lsr6HIBogTazsK3rdw7Mmof/?= =?us-ascii?Q?EylYCm9bm/AKw+hEeOM7Q0tMDi2NpFEXKa0exco5LaK+uEgdpGll5ow=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 6:ILZyh5zu6Fb64zR5e2HqqPv4PIjJD2uxvHF5Db5DltqUqJhaY/HMohI0sTsE0pvIqOgkEPVoT/PAlahANMmyKp2mDn9gEj9GqGg+zS8AUtKwGDNVl+oIauHhFw8vWutcZ0IPP1SY4yf9gI27gIYxr9zNYKy8J7KnlNjpUpylygSIBP+COVDle7FDSU6jxGdkwzg/PU3eCbWZAw9TyLgyT21XQHgQ9rvbmTm4YmrmNA0LoL1gmJGRVmmixZxWuyXLs0CIlT/9L6zJxKCjFPO4Z22r7Xa0UM4GRBKHue1P92wtzRGzgg4eRHciqkjuL/FaipWqM6u6SkMCVdE89SAE7A==; 5:9AnWxc5SbotKxbxREt34EcBdkoqwGP6cEaKgB3DSR7Mx44noSCff2Cpkpi0/fF0ckU8hh57jNGUc9j5W+bj8Gyd9XhcWKjMBXCMsmVReIh7Q/b9NSMRD4LEJz6dAduFPVTKHi00jsacMOlDTXi7y8g==; 24:DGyIR/couM72WtPIZPA13SHQ7rfHl4UXIee9psA/QyzIHgYLJlQLW7evMYFFrOe904ezDgLsO75f95IgK2FF2BBsMSC9Q71DFiPOnPGqX14=; 7:2yco4B3ac1NZFDOim2vUuzeLBPFl2X/GIMFf1TvyqFOjfMgW6DS1Ort4rG09k+zGOKf7y7zeaZjhjN3FtLptcxIv6iIQsTK7pMgazQKufpAoR2G83nyxpEUhwrLCexAVtYh3/sMGSkDSKjdidlZtIQ2UWz/5QzO+KM0FRWEaGDT+vvhXqKqFY8g9Ys7y+YLKSz+ZfXS7YJI3Jn6rElXROKReTdM3ei1pHiz4IkVl3g93nAAJ51BC7u6Bhz464lGN SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1451; 20:MkFQ0xtpqSLJwMofyxVbzZ+aRQOhHtaryMdKmLi5dSfTXa8Teidf+s5tAn7JKloPRO7fw48CqVI+MuuTnlbHOlojHxSQweQp5wPCz5gakItmhIBSDGCMeuU3K6fNowsd4ALVKGEjXReFSq7QP9PdPhWzcCwVWk1tn8RC8u5c+FU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:21:37.1014 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1451 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/rt298.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index f80cfe4..5555864 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c @@ -1095,12 +1095,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt298 = { .resume = rt298_resume, .set_bias_level = rt298_set_bias_level, .idle_bias_off = true, - .controls = rt298_snd_controls, - .num_controls = ARRAY_SIZE(rt298_snd_controls), - .dapm_widgets = rt298_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(rt298_dapm_widgets), - .dapm_routes = rt298_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(rt298_dapm_routes), + .component_driver = { + .controls = rt298_snd_controls, + .num_controls = ARRAY_SIZE(rt298_snd_controls), + .dapm_widgets = rt298_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(rt298_dapm_widgets), + .dapm_routes = rt298_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(rt298_dapm_routes), + }, }; static const struct regmap_config rt298_regmap = {