From patchwork Mon Aug 8 09:18:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267291 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 2758760871 for ; Mon, 8 Aug 2016 09:19:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 178E827D5D for ; Mon, 8 Aug 2016 09:19:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C2BE27DCE; Mon, 8 Aug 2016 09:19:00 +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 7174127D5D for ; Mon, 8 Aug 2016 09:18:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752005AbcHHJS7 (ORCPT ); Mon, 8 Aug 2016 05:18:59 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:8535 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752014AbcHHJS5 (ORCPT ); Mon, 8 Aug 2016 05:18:57 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 18:18:56 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 2B3C45954E; Mon, 8 Aug 2016 18:18:56 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 251F0480A5; Mon, 8 Aug 2016 18:18:56 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 17BFE48014; Mon, 8 Aug 2016 18:18:56 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac4.idc.renesas.com with ESMTP id UAA13054; Mon, 8 Aug 2016 18:18:55 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="216937380" Received: from mail-sg2apc01lp0242.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.242]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:18:55 +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=YLiLHduE21l0EK5tCc+E4/8mtNLFFdUnEemRLMwMasE=; b=jPsBblEUGCr/nw8cPyuX8f9ayKlh+vAtFHUR9ngwZCCt6mKGl/6+nvdLJRLBX79Jzt8bV2TZGOdDceDBUk26NNjmhWUmGIDDHXYouEIWVys0QzAH9jMSWTzmh62UZSXTbHdWmIS4gTnK58+dQfSPcXmLO+0PMtOMYn23Sv30TJ4= 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 SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) 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:18:52 +0000 Message-ID: <87vazb39sv.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 101/159] ASoC: codec duplicated callback function goes to component on wm9850 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:18:52 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR06CA0002.apcprd06.prod.outlook.com (10.164.91.12) To SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) X-MS-Office365-Filtering-Correlation-Id: d78bcc9d-1660-48c8-ff2a-08d3bf6d0436 X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 2:c2U/46PyJb63d1t2Ju3FSDqygC2AM/JTahQOVQHj5r0WV2O92yI+v3xZyE8h9lIx9+kpsvZ9chmHy6Ouu1eK/CcJKPOPjsDsXoONVPJ2JzIC1In/l3Xbpk7GwL/iQYEtGI7NzwkfvYKNshMdBDuZj84FIHB4EvF2TsjzqtwQ0KduUNe140K89Uq9f5ixQQ3S; 3:usEWyN6/lDU0yXFsE90fu4Q4E15Wm5Ysm6qtjCUoClAEubNXG6jfXMZH5XcBgQcBB2qiIlWJpevydh3w+2AgUU0c7z2wzvLJ32PKkxKBS2AkwIJGyZR88kNJHSdoPImK; 25:BAyc6nef5BP9Lv49Z1f7evIw08hsGwReqDQNpker5Pnc1d1JxL5rFbnCrE8H4+lU6uB7wj6C3rxIvjX3zFuuG06LQ+ATsxbKKv4RedFX0ZEWMfbmIb9kmieIpWOCiiaKHrp3MXX7yYRdSx1v8FZFOiU1cA+MwClhSC2Cpq4HO4+/0JYLxyKK59HYDahalZ4HUpMjEGN+yZtD9SJmkQ1vvMz/zKbKN/TE3gSPlLLrSaQmHeg3zFfeXb1FjakCdbKGn8Kdnp1p5opeurCHOGFyiRWM+ADRm8aOVYMlb1aaKR9SNTYgcsof4RYwnGUQn6RbOu5XTjj+oAzgllp+oUYiQIh48vrrG6RTiEVLfv4afxfiKU1rJI784D91sIZg/qb9ZfbZEXCUbAFPh/5p253kSAymnirk2H+jzRsEhVfljOM= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1453; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 31:RYJ6A789+LYO/4fpY4eLK9x8Ux5fkS05Bmj5/Q5kV/5f5kfPCUhGzqRfeq3dJ504SrYntk5cO8bJEOKoBnLfrLcQRVaSWnh5YH4qloF2YnTy5qs8w4MRNiKcLKwO5uNh8u68xQpqV71hPzVBrA34506w8DhWARai8UeVCumT4jzI2+pVU5rkMD72F03vgdbfPKN8XakfgjpDHW7DngZXcsEZkkKqMic+HJ29yu0C2iw=; 20:lUJef50RlSWu5EUKWW636MEZ28SBNbZsfHrh0aAfu61faRfU5if1xLUgBRG//5QFFqfA04KEeCv2RfHKcQ8CFaPyC3DhGyrCdeo6487b2rqKcEekjAG1QF9c22NqCwhsuEf31XNGTnMFYiD/NW6MfbCjr77eDkYriNZEEcjDDsOWaxKnQJ1vJBHb1jRw7agKuRL3VXGcCZe5FPQfUrqbZLhh84a6QFudEELpe9FVmFjIWaY6ygXsOW+9iZDdsRO3vMGZEMARYcv6BERw/Ajh7AEgEGD2QGRnk0qfAIjznxICOcLxlNoprrzpN7eBs7dw1mboqYXlqZeMnkGa3BtqhpwZ3dHGcKpuiPriqMI/KHBGSggBCeh7vimMaNv8I0wK4bXBnJJ6knv9qENKeaoZfhwVasFZcjJHlMacRBHW4AFKbSew6suexSvpaDswdzwaO5p+wH0oLk+4s7ey3Mn7XAD4mssZ2E5IVwLx0Im9iuJT5UfDt/E21dk4gg7x3zVF 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:SG2PR0601MB1453; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1453; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 4:1cNa6RN+dHRfV8GZ8VDiYJNd8GqFw4uybeMH/43Uao4udbzp3G+yUPtWRPBDAo99ew53sUXgb26QyAAq3sd6GNkE7mPYgoyegs3BCZobnkbCx3dG4wymS+ZFWG3CzRqe+NoJQx0mBPZ53qpd3EYE8Q+Zjuh72vSoExzpaOirS2R643iD0ms19z4Tdyrz98OgeEm2GZmSDBi1VbPgOSfWO2krf2Uio5duE/Z4lg6nLVCwHL5aHLTkfEWKITC7CnY1h3KfBjrfmNU3+dgChxNRj+NEUoekjR2ULphtWyw6unc7mvLxqk26CfcJEtEbpR2CopzPNJXDXtbwJqN0BhY93J5uSc5XTZHQoj0ZqL7atkyM4NzndcBOsCK/00pkT/zm8t5rOoGvV8TkbaD7YmNOkA== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(69596002)(101416001)(33646002)(46406003)(19580395003)(19580405001)(50466002)(83506001)(76176999)(8676002)(53416004)(50986999)(54356999)(106356001)(229853001)(2906002)(6116002)(81156014)(81166006)(4326007)(23726003)(77096005)(42186005)(2950100001)(68736007)(47776003)(105586002)(586003)(7846002)(86362001)(36756003)(66066001)(7736002)(92566002)(189998001)(110136002)(3846002)(97736004)(4001350100001)(305945005)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1453; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1453; 23:P/Y5O5CNDuhsWNOlgXQx6xdWrzk12YlwJEB/9Bl?= =?us-ascii?Q?qGMxCnep11i/oW93uvaArd6kbN+omyyWk/WPxtQYrmdEZQTHghPjBFt7Gd0U?= =?us-ascii?Q?VXzFIJ5e9pcrR5KVXzznvY38eMUrzchXzTy0vkXf6nedHqKxvl1QKOMr5cdR?= =?us-ascii?Q?m0PsSrrsIXxFO+bJ0y1RUfaWvSVn1Vh0lsjqUVf5/wZqmkvomWZ0EpGybHzd?= =?us-ascii?Q?tl4l6FLN75x3ImvusvFQdF6oQDNW3TUuDldaXEM7N/nHz3AmycCbBWkvkKZz?= =?us-ascii?Q?EeoY/OSZDWelPPcVL74K01qyRRzxGXdKXvlPVht6a0tTXohp16hDcD1XyRQt?= =?us-ascii?Q?NypBigaLSShlqzUzWmB+glAryHVYIExa5u+pDaa9KwbEOdfFE49nrOEXJqXH?= =?us-ascii?Q?oqoMd57E2Mq+I6fwho2CIrDMwLfY4WuvSSB7kFbRHlMGv5B/X6Yi6qX8oeaZ?= =?us-ascii?Q?qWZ5tY6ZPeJwjcoBC5Z8+jXaWeczmL1hr8CSrtRZV2GDWSnO/Eb11rySbmxp?= =?us-ascii?Q?Pfd6bfhujNPvJWme8N3EaYfQMnx8HA7fAtFB8bByN5dYCUVSJ5em5vn+Vcre?= =?us-ascii?Q?tTLoUIKon5if+0Rd98v93NW3USDKb9+YfKo84qdGjmFIVFFMfxa9I8VSd7cC?= =?us-ascii?Q?FqMRUgqut0YYYWsFcmMrdQ356Y1fuJ7p7esCVl75wAZGloUx+21uJNzyUA09?= =?us-ascii?Q?i3qCMhDHIASg/t8FkeGjD3z0pByjGGnfqPzbTiGYpYRGFcrsRcEU2e6yQxm3?= =?us-ascii?Q?1+SI1upCGP2U9GV21OaUBhR0djsYy7V46b58vhg9zqWrjHOGcZajvRfmovaW?= =?us-ascii?Q?7Upi0tqEfBOya71+U+Kb8+MxJoZmFZaJ7vO0HPklf3My3nZp45PbSb/o72Md?= =?us-ascii?Q?OAtzgQjQFvh7e3dEpIgsrp/gQz2yGRPhqro9eybYl5Z9ovYnY7gyRqG6X9VO?= =?us-ascii?Q?RXHuoZnbuj5aLgQ3gJ/7GBE9pWj59XBdtNSa1zjGMOrsIYpuaVVyotgrrvt5?= =?us-ascii?Q?GDf5lr8H/kwL7CyYNIzehUTcODmLbSFSsyjQsbeZv+EagaIIANrOj7F8LtWh?= =?us-ascii?Q?oA/4To/P/YoyUX/6JLeqqYkfYbslZZhfJ/qO411R3F56X3ieBR7dJrmSbnvt?= =?us-ascii?Q?E8tKVWCxPsLQEcw7UkAGDEsH5tqmc1xDbq+mNsCv/TYIsaIpoudT9Ew=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 6:HQbh0WKzeORnjD0yOTV9DuVMIZukXvyS9aaNcA6uchJqLckqEEQb+M49YhnN2GkKCt5gcLRhJqMDhYV6hOfmtlvNEqU9aMoiI5nOiXNyH9azzASBnpCOU8kV8aAsWupeTH+N94DaZgF2LoF7USiXXT2Y67mh23Z3a5gxph+b7L0rmev/tKswJhBqYQNlKmzZOwcFVTSUXXeTTWy55ayeTRe6loyxS1/kHYAUYurRGeANvb4Fk8ZgIskXppa47yYWK/hxeDnQ+TDmA+dtVR7BOg2nuYnqmm25degdUk5ZInkzIpWxIk1c4GfhY2Gt+Don1E+aV+nq4gY+fBmMCntt+w==; 5:/VvT+WPXU0qSj0S5SiRrH7XCTvsABPUrRj5iAGH9zPjufglSJUopfBFNkVLacx1lPNkW8/3zggSu+x/0L4JN7L8jjPKWevHIPMzm2dlhUOc0Zvo07wxfcFyy6aoK+I9t8EpG2P8XVDqwdrm+8JJH6A==; 24:YxhRESCe5dKJJirw/cbnAL2KNy125se+7feCaUF/6w+gvsyyDLg9c+JnkuHMIk4VjBnwgPFjLNLTgGN+AwwMXBfEjvrsSlU18b5zOfyht98=; 7:ZO484x/C2GDgpY1pSdKaKFKthSgf7UyiLSnR+8+JKVzZp0V6/hMdR/Ks75dOw7qMSIZ7gSRbKBVTP1AfzXiqTatLs9gq/siNZzbiMoE6v9BCzsaVn2gw2t8mcKN7E+/6vXs7oRZyG/tg8R1HTkbfkqAtrOkTawqRjU/dhFLFWmvDcmuP4AHms7Hq06JslQgQwJfQ/ADTPNmorQwW4faFVQw96iFO3UuTRRanmjsJCS9wvY+F54R8JcAquprvW9vA SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:KUFzkjUfNxfgnJnk/XM4DzW7JN4W3ELESmO0gSjEa0KSGIekr/7bLp/sE3JUf4RVoDfxXRf66fiha1bVh+vRt+f9/NZjQUQWB6uH4CqBlHE+7KltshYNotPUz6sdAT7MX0I0orVSUv0BRS8pj7Y+1t9Gmxfwn0bbI6GRD7ZrtO4= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:18:52.6911 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1453 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/max9850.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/max9850.c b/sound/soc/codecs/max9850.c index c14a79d..0610840 100644 --- a/sound/soc/codecs/max9850.c +++ b/sound/soc/codecs/max9850.c @@ -306,12 +306,14 @@ static struct snd_soc_codec_driver soc_codec_dev_max9850 = { .set_bias_level = max9850_set_bias_level, .suspend_bias_off = true, - .controls = max9850_controls, - .num_controls = ARRAY_SIZE(max9850_controls), - .dapm_widgets = max9850_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(max9850_dapm_widgets), - .dapm_routes = max9850_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(max9850_dapm_routes), + .component_driver = { + .controls = max9850_controls, + .num_controls = ARRAY_SIZE(max9850_controls), + .dapm_widgets = max9850_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(max9850_dapm_widgets), + .dapm_routes = max9850_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(max9850_dapm_routes), + }, }; static int max9850_i2c_probe(struct i2c_client *i2c,