From patchwork Mon Aug 8 09:19:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267297 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 1807E60754 for ; Mon, 8 Aug 2016 09:19:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08463212D9 for ; Mon, 8 Aug 2016 09:19:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F119D27D64; Mon, 8 Aug 2016 09:19:35 +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 6FBD1212D9 for ; Mon, 8 Aug 2016 09:19:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751951AbcHHJTf (ORCPT ); Mon, 8 Aug 2016 05:19:35 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:62113 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751280AbcHHJTe (ORCPT ); Mon, 8 Aug 2016 05:19:34 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:19:33 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 171DF52273; Mon, 8 Aug 2016 18:19:33 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 10F592806E; Mon, 8 Aug 2016 18:19:33 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 0AF632806D; Mon, 8 Aug 2016 18:19:33 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id UAM15109; Mon, 8 Aug 2016 18:19:32 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216937420" Received: from mail-sg2apc01lp0248.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.248]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:19:32 +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=RVgAb1Hmjxei3MC0MN4Cxf3WV0DJjcyJByv2rpuaFlw=; b=ecAkRJcu8CTWtNtuAMMgj8kD8q2mfOKMemm4oUOMIAXyE7QlJV48jhOv/S2EnQZCDL/Vsaizj8TwH0MQOi7Ukt70XmAd63jFmqcpXfCrmFlVTh1A6b7tu4Acd9NX0v2jKYjhuKFBgBR9jlM3IxhwKOgwMTK0XN8GrMwxnof6y6Y= 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 KL1PR0601MB1446.apcprd06.prod.outlook.com (10.169.69.24) 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:19:29 +0000 Message-ID: <87shuf39rq.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 103/159] ASoC: codec duplicated callback function goes to component on max98925 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:19:29 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0031.jpnprd01.prod.outlook.com (10.164.161.141) To KL1PR0601MB1446.apcprd06.prod.outlook.com (10.169.69.24) X-MS-Office365-Filtering-Correlation-Id: d7b2f4a8-0fd2-4070-e0ef-08d3bf6d1a13 X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 2:9GcZVYggJbcqqF7G9W78LCH/0KIx8bIaYmorIrVeOhggfMgxmee0TRilJR2fUGvNu/rs8DaLfe+stj0Tvox17dcoVTXl7st4pTGHRhutQYihsswYlWveyjYMNf8/lZrXkj0LXFiXyUGKrHDkAI0He/40ivAnuAaAlzBkfcmIxC+dsxRvhS1KUSpYl2fehD6/; 3:NPiK+ZAYjNElVXhW1mLKtuISE9dpZMfSk6kj2KjZPFHM6xcR8kW9bidj6/E4wSm8EO4+aGS0KxkJLAo4GyjjUhZG5ipgF5tlDIsYb/jsPT0IjTWxlYVplAEFa0lygM6f X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:KL1PR0601MB1446; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 25:PwvGITtgDb5LG1X7ggPejpGBpzfyEmoJfxKGCyc70YoJszssLvI1t/afWgk2f7XvLPjvf0RqMf1QO5B940IJ9ABmmmWgek3tEOJ2Xtka87jJ1jIrTK4HvpuDP5mMSXiq42sufdH75L8f2Cq0YuH/bv7LoOyJwpJfZl6CVfz7VOlbQMfyuJOVgmTzrtBfWieSqbf5GhEyWJZCcYHTVPYGXx7ZnCPLYGcIO5nyGYgLuTuh8Jz0GzH/AANSrbU31kwyxSoxZwRI5ks2ZWiTnBEavwSozBNUVz+5NNwtCZydJgr8QqzagmH3lVRNuzVCm+gNEGc0I6kGA9HlntHpKFgORQwHp3hr6DLJxG/7kgn3QpMC5Gea/Q2FLV1iMfFyCCdfMZIx6HmQzlJMj980CWwF0IHYfHvwM8MBvmaMgBJH/fQ7MeghlcVM7iWv619PC6XMIjODjTW/qKTwCwuxPiZdD64kDJkNTgU7Lyrc5XpShF8SDYnuDg/4lSRvzlRrPAvDxVlzvexZbBHF5cLrazOl9q4XQC3BK2XMzLCdlG9pgiv1Dw/BizoJr02qRDrkN8RRQ7NWs/ODvmdyBOkrip9gunmL8FIpOYgCiljm7z96b7yDIVDvsGHlvIgs4PaoR5PQUukRD2oHyb2qPaGSeUzVPVX2Nvk9+mkOA9Puh9PlGJRseswMEzZ9thx/0zagBvqu; 31:DcDvp2PtsRe4VGKhyA9niuOWKgkxtvAawsWuRtFhIhpovo3p4Cb1pfNHoA1AE326gk2fOla2DQOdlFBkO1WtCGMr00lB97/KxjE7tCJN16EYJ5G8JAzsBw2Sp/I3REaPUcNMeZma/h837N3xaI2HnjT5ksiYhlKZFpsWPf6TSpHMmxPjarQ+VuRa8tvXMUbU3PDoZSJHXHATttDOsbHXhsl+ud0V06KlvqL V9VTYBTg= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 20:9xG/4GtMmfuhF4tWKg74Egti82if0R2pmZap3Cr3AiXSKwxzTXKUOOnIkDxrYxN9mtL2yKFRwCyqTecj4/ZuU9GHRp2Hf1LJ0xAsrJJcvdItEucTWq7jgPeO/64g3j5PxIvPvzrf4rkmB4q7/YTRi6vZSKux0Vr5tothZFcGk4b2YVpv18anUhmusFGCjyws6HQiOtqZLWes2HEA25L3GyEUd9MlTBO7sI5Wuv5AIV5yZqmZ5EcG12TzgZ2q83gxU8evNUGy24zJ7XpbLVLzsWRegI76dgCEWHoDvVF95LqeGVh/F+URAW57EiCCfrkSRLX8FtSAsXT3u1TV2AnAJr3HD18kecImv6dcjClCZIBFboWpbWcCqqKQaQCRoi94D1DJVmNBhvc3KCur139s4LhLIS4FUtAEHyDD+VscLIH21U0L/eJ/o0YKVuiGIObY6AlULdLla9s9sw3J0rv6i96BKTiDB965dpb+3bjAmq23Gf1hMnf1lxuGTd9Y/fEb; 4:J0J/zVKeRkoXX8e9npUdOIpxpcK5b9tueFrzsMSgxB6gOmEJQx8cReYQTJbSbXcjaxevbZOVYFFNxvgLrB0t/77JUqLyoNEE69cpmb4CyxgCzjDKQg3iUvA1YNaC2LZqR6gpmYADd/PFr35hAMQjdB4bkxz5VswBey4+rKAAVqHokTfuGrSQDVuULFeKXnbim7FQQQG3cMOrF2Z5nFd+Cq7n3Q4AZZ5aLnqEt+kdfAd+GW5+b0fbeFbLFRBxbXeF+oCyp1fjeFbmnTVrnf/jymaO5/i4yHNsZZlsQpfNq8XfMh9QMJ9sUD9Zuj2LTwpXStC7+pdbpO4iLPE63OaZV4mvAnFSwgUbwSo+XMfcl92lsCsK5Fb1kGOTLIrcZiXJqd///L8giSV2mgHp74StZQ== 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)(3002001)(10201501046)(6055026); SRVR:KL1PR0601MB1446; BCL:0; PCL:0; RULEID:; SRVR:KL1PR0601MB1446; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(110136002)(76176999)(2950100001)(54356999)(83506001)(8676002)(81156014)(97736004)(4326007)(81166006)(4001350100001)(33646002)(229853001)(7846002)(2906002)(19580405001)(66066001)(68736007)(69596002)(47776003)(7736002)(50986999)(106356001)(92566002)(50466002)(19580395003)(77096005)(586003)(23726003)(189998001)(42186005)(305945005)(46406003)(101416001)(6116002)(105586002)(3846002)(53416004)(36756003)(86362001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1446; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; KL1PR0601MB1446; 23:HHNffpQMdo52AMJyudNfbRRtFUprrBVHQKZ8ptY?= =?us-ascii?Q?T32G/UpbhUJNQGSG2OB8EuvNUVn6e2Q5wOuwDwlzFltC0kkyQPkTQTFDauU5?= =?us-ascii?Q?w03Hcg/Z+rCVYcjnZQdtal/ZJ35ksJM5RorJDhUJh+UskGxsTdcbbsD3TIRU?= =?us-ascii?Q?+orQMpLsq5dt5nSZK9rJJ9XCEuf6456ViMUMaV6oUO9wyo04B5Qj+W/+AZzk?= =?us-ascii?Q?YMhNmuty9CS+a8I4/HcWc6ddZy3W0J+M0e2w+lZkQCW+oA4OnvXCY+G7vRyI?= =?us-ascii?Q?H9c7VqbAcvXNvbGLyjQyzQVfgVZJLBQV3cjEz/JC4GlTKetQ1i6tZTtB6DKN?= =?us-ascii?Q?+dyBqaHScFg9oxFbDi/w2ocK6OpQtgdIYyXu/vWePuq4l0GeFGMdOFOsc1mY?= =?us-ascii?Q?kicUiREykaK5l3xlBmScmqyQzDSzDfvTU6m4SQFPUE8C0pDkzr/5gyey/pyQ?= =?us-ascii?Q?0lxuRhg5Fbdxw+EAg6TLgS0GgTlqEy/JqSgRCBcED1EOTe7iHlnuaMHyNdZo?= =?us-ascii?Q?DbNQ7shivnmMBQ5/81A7nRKls143gGcIDql5Kw5RiKe6u5MarZYHgzqG3LDn?= =?us-ascii?Q?LOq9wMvAOYmuLnxJdIUC8LNGpUEjtRVDJYd8B7RqnpBlfCnrm/WxNtOBExp1?= =?us-ascii?Q?NeSsl2qoQCegPRT8RoDHubPmgqyi4TQX4aE3LlyFzk+0IGKXj8WR4ELIbSsM?= =?us-ascii?Q?hWkUDCsXFBoMG3pQxl17n8VGDvsoxvwb/vkIfZ1mHHujayKkNZ8eV2OZzAxw?= =?us-ascii?Q?PEzxlKAyLWkjsJHNrIKowTfVOpS75aNipDqQwM/cmTDInYic2yf1BZ2joaKj?= =?us-ascii?Q?lk5VsCm5cZBwQoItEbn/B0YbT42YLggIoar9sxb+rrJHUV2ZJ4IxlLYbFyme?= =?us-ascii?Q?bW3SQfYHE9ev5b1HbGDJOqqdAs+y4GEylwZWeszDDUAqLxTESVzCEx15pPyV?= =?us-ascii?Q?nUGfpXfVk4BoXe7DFQsCEFzcWA/dFzEfuh67Lx6ID8i2jTdGTh2/ub1K/ti6?= =?us-ascii?Q?x7OP74r91ySsayYqPPafF9nDm7r3lh58nagUc3z+6JVU30qaVSCvnASvUbxN?= =?us-ascii?Q?bZ1eRuSg+ffUE7TdD4SvKxviPCx/zpq7JFvOOsXcW7babObWQfEn8bv1jYb9?= =?us-ascii?Q?u60kPA11Qj9H+c6EM95alGT/EpCh3IZWKKJZ8IaPzIoCJCNJD7Fl9vg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 6:QUIKMdLWFQFTWE+pky1eIy6Mt9qbY6RFTd4iewF0mucm+E1x08iakqs6T8fI6NlYRgnkUl0M89IIj3xm4n5npuAOd8BU8m5hP42yf1zldzgwCqtt4oGezPmClO/aL8nA21Uxdd8IPppg4o70b+XUlbsK/gaLAqwIqAfBpOWEFyCr/pngUXfp6lsrd2yfkHsOmeKeqLB3ZEaqS4kN4xSE30S+nor3c0S1IjT2AZmjadtxkOPwXWt+oqPRTNWB4WfnwSK6ZVtOyqRtTYHJxu9GslvrAXmjyVvogchdqp9uilyOGiJuAZxqgXXuyc3s6J0zpn4fHLTiMm0y1hUxtNuLfw==; 5:KJRBHrWWzVaLPO2ctbxgAkzr3AePKVJh7Kxtt8fbnAQjwnBG5gUF7qJ6fJBUl67/RsPFYVSc/LXtQqjTj2CBP0PsQkC+ZyYdTZbdWUws5f3p9fn8ES6NwUylgSusJKCtSdPiX1RmzcRPruchw0yFVw==; 24:JZx2DE19tYhpzP+T6wGnpsM3jNnRHsJVHUh/Lvrtsvz9CD2LXuTIqd7MNcD6pI73Wj+/EP/poLxbKJ405k8w2JZ3uWQ8ZfRQJD2CFokqu58=; 7:f1WgXYKgPdL+Lwns/Icip1A9hswCz/L1gj3Hs/P/fiyujZCdFYFC8MMNw6+wYXuHDie9SepQNZ5Kv1igMZ0XuICkmilV4TzcliCWJ8iUgEDDQXD7cqEAF1lhG3DnEIb68h4tMXGre9tvuBoRIY+m4kfP38uxiYOzfGqX0493iO8F2fYBnwv+R6440NKX5wseizGVndD7sg9s/vxMK6IOylUjcZUSnAjtZxW5ys3jYdVOVAaLKbz10HUpP/3YkmWf SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 20:WujQ3DvAOeOdzKuc8NfXD3pfntXzbL8f+64P8g8kpu8FaKNtOwbHqwyoexCahVNO1Asu1nL7pgzTpWCZbZLGVrwmFFHGtK3OlXB2xm0r4ZsCuYFUPHMqRvgVxo2IROq09ggGAVzluZl0s7wMAfkM558L5jNHGBsK0H2BNGISOlA= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:19:29.2186 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1446 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/max98925.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/max98925.c b/sound/soc/codecs/max98925.c index 5990de3..327eaa2 100644 --- a/sound/soc/codecs/max98925.c +++ b/sound/soc/codecs/max98925.c @@ -540,12 +540,14 @@ static int max98925_probe(struct snd_soc_codec *codec) static const struct snd_soc_codec_driver soc_codec_dev_max98925 = { .probe = max98925_probe, - .controls = max98925_snd_controls, - .num_controls = ARRAY_SIZE(max98925_snd_controls), - .dapm_routes = max98925_audio_map, - .num_dapm_routes = ARRAY_SIZE(max98925_audio_map), - .dapm_widgets = max98925_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(max98925_dapm_widgets), + .component_driver = { + .controls = max98925_snd_controls, + .num_controls = ARRAY_SIZE(max98925_snd_controls), + .dapm_routes = max98925_audio_map, + .num_dapm_routes = ARRAY_SIZE(max98925_audio_map), + .dapm_widgets = max98925_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(max98925_dapm_widgets), + }, }; static const struct regmap_config max98925_regmap = {