From patchwork Mon Aug 8 09:24:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267381 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 8877C607D6 for ; Mon, 8 Aug 2016 09:24:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7847626220 for ; Mon, 8 Aug 2016 09:24:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6CDF627D64; Mon, 8 Aug 2016 09:24:32 +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 D6B0826220 for ; Mon, 8 Aug 2016 09:24:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751259AbcHHJYb (ORCPT ); Mon, 8 Aug 2016 05:24:31 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:6753 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751158AbcHHJYa (ORCPT ); Mon, 8 Aug 2016 05:24:30 -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:28 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 02AAB52544; Mon, 8 Aug 2016 18:24:29 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id EC9C1480A4; Mon, 8 Aug 2016 18:24:28 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id E54F448014; Mon, 8 Aug 2016 18:24:28 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac4.idc.renesas.com with ESMTP id UAC15167; Mon, 8 Aug 2016 18:24:28 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="216937835" Received: from mail-hk2apc01lp0207.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.207]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:24:27 +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=tYvjaaLIezm+YU/SJu4b7WajEU49XqNYCmvqObcP7Hw=; b=bGsK7rEvh1UwTd7HKAWd6uSFQVFoHbqK7nmwLEJPcBSg6wj59OFuYGcJPHK7QHPn47VRkXPEshOO1ZNQOoLAdLqHMr7HOf0BKHSwaWh4cFUU+AXwP8y0V4sqZnE+jQUp4KmUj2iMnMG7dE6tVxXTlohD+ZQqKXmsd8mbk0aRYYI= 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 SG2PR0601MB1456.apcprd06.prod.outlook.com (10.169.106.22) 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:24 +0000 Message-ID: <8760rb39ji.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 119/159] ASoC: codec duplicated callback function goes to component on sn95031 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:24 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0067.jpnprd01.prod.outlook.com (10.165.51.155) To SG2PR0601MB1456.apcprd06.prod.outlook.com (10.169.106.22) X-MS-Office365-Filtering-Correlation-Id: b5af6b22-601a-46e7-6a38-08d3bf6dca53 X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 2:WmhCObNfO9F9j6ev4N61E742JQAI+7P3+z4Jo+fPFjroJ3JjclGDezoeqYTfVb6/TMMqxsTqCYKvgfgffyYz5jqwlloCahwMVLvST0H2W7mc9T06sxDqlNFHro+IRu+qqTLgqmqJp2EjJY3YGTmFvOGAfduTpU/zUFYYgmXlfWIWDwiXEcxGKjKTCz/befIF; 3:mpyoPXfHMxmWG0TP7yON+BtsGo4cN/BhMCYWhVO5Vl4ZFPflCOGMHHyYogZlBXQ1lYRpnKRbA4JEaB9MjUUAdfHROsHahrO1i2s76OqVg5Qlk7Ygx2mauhfiiMiiDqlm; 25:sC/y+8Ry3sCAhqMzvZIrD74MAgcQkDuQ417yviN7DutilBkjGvgnwDbB67PphJRpN2Sibw42HlBI44ZajmeGMwqtUN5fewaZG7LaT5x7qBag4CJNap3LaXOVj9Jx2RB8FqRXv6rES0haY9cBY2zNVh1qtq0IxqjPPVQnh1u2lSYTs9f11dhYTLBOD+GQLO6YxSurNSFVOFfjjwe9g5t+XhbBEjqploFKg5379aCOgL878W6LQnxstyUsZzAvRXQUKLFF97EmXfiIhaWkiY9dpc7by0ZpArkLeWw5H+6Kt1skkuMSlSoTz4e9SFCpMV4K1eJx5CuJxOyRm1udjqpRTviqaLbWjuXhLl6Q/C8nHc+3nRNygjTqUyqjEIcz6Qz5AU/zel4igcenyEyTTUQ+nl+xQ6Gn8fwBjIrmCIvz06E= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1456; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 31:UT/y1ikbLFiLDA8XZD/ei8wmi42GUN1SXswAfKJjW0myMm9o/Oh5QeWHm0Fm1G+Kd5jPRB6ni9zEPC4RilsIXnxyIUdTcg1rIhumOjv1zEobd8LGNDcfqFmLT8hkE9jvMpccknbOBDQ1AjM/HTtHrgO6o0ho07CpOB8NKWiQ9HVvBbwcxyiKsGrXNvFl9+DxmN2Ohl/V9/rJrbIoMWkt2kXrSmA13vCvqnSLm6hCy5E=; 20:I+4E94panNAJPwSnWIHVw9wDt+yabF/hJ1fJcma2s8Dec0yMyPNo2d+WMMvh+wMMNLJ5UyFZmA6oJvWxatLqPeXuaAhTQJgWU0n+RODqBl92GFxK3VqaW4o7m1EZ5XNUWdAXyqW88cwGGudnSMB37BHkQAhvgit62Cefc1cH6lczCa+7gT5KjFivVWu6ySHiCMEcF2gBOdjYQX1l080LvGX/hc3Ohgv6gYCkkKnFCltTs9RHunY9L+AVLE1qWZEvNVHSfbXXMEYpcn2NvmtNm2VApe+43381fz4xJULF5sUxEUY6K+wUgljf8rQXLGePFX+EsObWuBw44QENZdGJz+mxTIJtl9XybSVFJBTC8UpjklPbowWPb0HGgqdKAH14/kPcCYXxsIuegIe4d3LSX62fvyoln/z1Jh6GhTVnF1wabgvntWxVqwaqk1FaZx/SdHFxbNHWvC5ypJWsosFhwLAmZ9yK1qVwX3LHuwMgSXBEt+HzecMq0YsdRFYSQcgj 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:SG2PR0601MB1456; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1456; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 4:/3Pge3bMA/Ujy4r0K91RuwocHXRLyLYNibL1gY4x8FRsqFeQfXx4LLoqPAiKK8UjFXvAX6lSwdN5leHj/u1vxZ4ruODZg7MA/SwecZ00/p8mL+4bDcvKMs82Z/5aqPwvCXBxTs5Rdg6BCG3Z6ONyQdV7Ss3nHobX4aLJNQJT1H+2gx1wTH7nRuaAJgCSvia/g52tCkFlHGoD2sS6UxwrYN8Lrp1XIqBO54Jfcjm67ILPRigATdYEAd2KYV6cfVAUTDw8jlpfQ+iQafljwvwUKFggT9WJIq6qdyOJUAVWVirm1l73JjXujNhqKVpMAEIxbB8p7Ethigi5dzld64G0siibBn46Mn6RLks0fV422k9cG0n8eiAEg6OS5waXpVUkvMTLmrSxXTRY+rKN54IkIw== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(2950100001)(2906002)(68736007)(76176999)(54356999)(19580395003)(19580405001)(50986999)(8676002)(81166006)(81156014)(86362001)(3846002)(33646002)(229853001)(106356001)(4326007)(83506001)(23726003)(6116002)(77096005)(69596002)(42186005)(46406003)(105586002)(53416004)(101416001)(4001350100001)(7736002)(110136002)(36756003)(189998001)(7846002)(305945005)(50466002)(47776003)(92566002)(97736004)(66066001)(586003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1456; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1456; 23:Q4rgxiIY25r+5rxHkMBlv3NsvIh0vEEgTGeYfzi?= =?us-ascii?Q?0HCgIZ3RZEovLudSHpNcHvgGcpd19SJZN9bA0D9Kak2VhMUza/eavNi7g109?= =?us-ascii?Q?9slFB+YhsuBaTZD8sSNiFRs3s68HsfwZihXFzl/uz2vJfKVXUUoVPbLlLP+d?= =?us-ascii?Q?iRsslVDdp/lZESdHIT3i/eqiMMxjmf7rbXTL4D6z4x3UUq3GwExKErqRMhUL?= =?us-ascii?Q?gBS8pIgmipDMM1t8hfd97GQLztGSDO3SDX/BCSNT+eB5Iw1+Rn9pin0tg4jB?= =?us-ascii?Q?EOlZCL5i5gWiuP0m7cINHYK0CPmbIUhV5LzpQbH3XDDs5BfbDOLXIQL0ZVM8?= =?us-ascii?Q?rpsoTHSEd82FO4+YEBiY4gogbxejnbQCpAX7OaAY1cAmRgSArZCa0IqzdLdE?= =?us-ascii?Q?kxNUSAM5Tb7NIRnhMZQy80Xbfvh6Fw1TtKxOc2j1B9lt7Tq8o3OKajL3D2YT?= =?us-ascii?Q?oQ+qNrgbDIrMecHaGdpjfsEaTMPBtzqs98FJRIPl887mkEfKDEXdYtU9Nr2t?= =?us-ascii?Q?1Lq9oW6ltinEK2s04O7PsQ1yX2WJRWsRAVhVBQGwNLL7t9CqKOL/skn3jpJ9?= =?us-ascii?Q?+fu5bZOvKvM6lCmwf+a6/WqF0gY80hJ7inGPtdsHYI8L2kPJiHhqKKXcLHgj?= =?us-ascii?Q?854wy0LGZN2eCy4kZpDujI63GMfOV7V+ILrMMkhX4CEzRiQjqpHqLjR/LIZt?= =?us-ascii?Q?6GjK4QAargyV/heE/fOcegrau2xl8Y5Y8MVpbfABdbHsBIbTV4ddDLLlgvQv?= =?us-ascii?Q?JjQversFv+lDTCQJl3T1yTVPKloMyGseYy+anyArTgvJoQd1OJlXOMzlRUEm?= =?us-ascii?Q?yoedEPiDs8XpbCYb9oDPIiSjMCejgcRylC76T8ALTZVy3sHGfMCgTaZEKrdV?= =?us-ascii?Q?u25YibeKPGy0pi6vfxFDT4vx0RfkDB1tOQEG8E0Wa7/Y1PkEpoSeD/gjRTb4?= =?us-ascii?Q?X4sn3zt7WimXC8ebR1m80ZvGl1vtuz1e7UCKua6qb9zxpWIK6BtLf1kZ1LLq?= =?us-ascii?Q?i48c3dwgZl960dGQF8/67I7j84cq5qxHsMjTYBgvikOou73AXRhcKNVKo6pj?= =?us-ascii?Q?yhZ/ff4O2OM3tOqapXQDpErvA5zd+k+3c0suLzMD2M7zNohwg2qwkhLF7h4O?= =?us-ascii?Q?1o28TmfWjohULbDH/FxYivPvf6GP5go3CXxJJ98DXnl2yTcXBhUyuMw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 6:95kNn+2xwh4D7kMQwWNTcU1GI1ojwg5Ch0j3A9ch4X126uBHrFL7lsTshJLx8nX+e2NwDXm3Sf0by+4e7ZNRHqv+COADIOD1vOQES9mkkMdklvEJppZy46HxytXm9BMk+nMeULnJUWBJZf5BKkcMAnfedbfjqp90Lz9WtgOfQ4E4+eRq4o6xg/O7zEKWT0npIkWfQNxAJG6kb49gTfKRU9SSGbDeuzG8T2TQnn5gqsqlxZ7Req9IWIgQ3O7Qh+Fi4xzE8r6DyB0kAtCzrazHq1te/o8IJzP3uQpYnNZ9q8pu6ZsY5Q1UjdLsdgL9QILYIf+FY7Rz1LJOU1BkOZB7CA==; 5:ED0cQ6U/Sa/Br5/hujax2S0HX8YrHeKOoEfsWRuRkGpRX2HMqXPC+uV/0+6xDu9sGOUcJXEySsFsl1UVejmcf3qYKkjGldY0kknHjH/gNf1XyA+02X2n1owzD1roLvGJCuwQSk+VKtdoExAt/FWBVA==; 24:ntHxecUdgrO5Y6I+EkC2C0gO/EbnIs6x2KzOLG0lzQnMRVr31qq0yCH4/jpWda5g/jCuXND3cmpx34i0InQk1e0o/+RfO2fovzS/lyfzHJU=; 7:0uA3uNT+FfZTrhn57rNytaheLo2b3l6HEaDTom2RBSoQ0UjjwUy9nHnXtiV2DhSkFZzJLlGi8rseAxE4CgNRYWkU4EIB1dlKaYkaHF9O5UEuTk6vh0Qisn3T9LrgsfFIHzvrq/wxNqEiXm10XpXGs2cvgaNBl+d/87M3rWEmdrPicgU78p0OOVkUzoa/fq8s38Epk32PQ159Ev0pSvY+7g7r0h4Qm1FfYdECrwDnfjgaaP9ri32UDNC+Y5HQFxHr SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 20:6LQIl2SSTIpWT+2CL7Z6LyyUIFawZAnmv/XNYzsmllZ419S7cS6+iTpMa6bSPyceBqhpTGxjfGkM30EsNsZOx6fm9tjYKpbwRSnI/kUHd/5iMMgsP7PMhWzNtml1k3c4htYcZwvJdBZDyBXcGByOy9P60qc468hbsvjsEe9i39s= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:24:24.9431 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1456 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/sn95031.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c index 3a7de01..eae54c3 100644 --- a/sound/soc/codecs/sn95031.c +++ b/sound/soc/codecs/sn95031.c @@ -888,12 +888,14 @@ static struct snd_soc_codec_driver sn95031_codec = { .set_bias_level = sn95031_set_vaud_bias, .idle_bias_off = true, - .controls = sn95031_snd_controls, - .num_controls = ARRAY_SIZE(sn95031_snd_controls), - .dapm_widgets = sn95031_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(sn95031_dapm_widgets), - .dapm_routes = sn95031_audio_map, - .num_dapm_routes = ARRAY_SIZE(sn95031_audio_map), + .component_driver = { + .controls = sn95031_snd_controls, + .num_controls = ARRAY_SIZE(sn95031_snd_controls), + .dapm_widgets = sn95031_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(sn95031_dapm_widgets), + .dapm_routes = sn95031_audio_map, + .num_dapm_routes = ARRAY_SIZE(sn95031_audio_map), + }, }; static int sn95031_device_probe(struct platform_device *pdev)