From patchwork Mon Aug 8 09:22:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267359 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 E4696607D6 for ; Mon, 8 Aug 2016 09:23:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D492C26220 for ; Mon, 8 Aug 2016 09:23:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C910C27D64; Mon, 8 Aug 2016 09:23:04 +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 868B026220 for ; Mon, 8 Aug 2016 09:23:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751951AbcHHJXA (ORCPT ); Mon, 8 Aug 2016 05:23:00 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:58050 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752134AbcHHJW5 (ORCPT ); Mon, 8 Aug 2016 05:22:57 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:22:56 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 601C352472; Mon, 8 Aug 2016 18:22:56 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 51449480A5; Mon, 8 Aug 2016 18:22:56 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 50AF5480A4; Mon, 8 Aug 2016 18:22:56 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id UAA14717; Mon, 8 Aug 2016 18:22:56 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217447686" Received: from mail-sg2apc01lp0242.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.242]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:22:54 +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=1EbgJmu9B/29Mx6taNRaIwm7YLzNVjZ8+jyzWGO6HT8=; b=JQUSfsVnc6Mrj2R3PlaANyrcLQrwWlm05ljrEkGcsTUtCBJcdLG+swJZjlsTEWSUVSxvy2sl96lsVTIM3QwIFFRogW0H3aDSm0x8EE1hmDxy3Lc7Fu41jK6V97V8pF7B6NFxwCtU6xiNxZNlFSBu3PBCT3EAZxWB0Ta8p79ialU= 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 PS1PR0601MB1449.apcprd06.prod.outlook.com (10.165.210.153) 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:22:51 +0000 Message-ID: <87d1lj39m5.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 114/159] ASoC: codec duplicated callback function goes to component on rt5651 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:22:51 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TYXPR0101CA0028.jpnprd01.prod.outlook.com (10.168.40.166) To PS1PR0601MB1449.apcprd06.prod.outlook.com (10.165.210.153) X-MS-Office365-Filtering-Correlation-Id: 83c76365-fcca-4fe3-e93c-08d3bf6d9279 X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 2:ZFy1P6+BSWwU7iOrxYHfG6dG3NwoC5LGjZo3QFWNC+uwsYJb9H6gunAjm/NpzfvYG/Wt8hD5ziqQB9nJSZFgFSXMVEgECn8OVjplXrKpGawPDfZjmFdEeSc6g48GCaFVSfaph8nCPYcHs/5ynp6+CPv8UKCbfI9Nl11wQ8lwiyen3qkn0/JdZaThTbio130u; 3:Il+K+tI212H5zfGo3m94M1/5ksBKsaZjkSLDDuC29qcpjPItbEJcvLi/KMddGYgHsRGfDQsq4dQQl1rBoRabFZNvMd6dl1sh05GipAsUMHNRWZ7MdBL6+MyvgDImVI43; 25:Wlfmq8QVmxiIbx5Sr18ziyav0AGMzevdevseam4CItn5Ze5fRpo/ybeSrHSnanWFtROcBpAx6uds1bIBC1uQTbRRvsQjhQe/YWoL9WOUaJrHbI3XRB4lv9x/iOFbEshHUdzaphZPets/3uuHOyF+uFMqXFtHg4xbnFV9e1tjQESE2zyOqXuNJDgTJJ1tuEUMEnra8Ci59HNiIjNf5h8S9+cXoiAC9Egj84488t7KGcP8XGeaewGS7GWvsDgOBAmI3TgojbGY9z9TTCbq25FO0JInc8F5x/uUa2GSAHRYK54paH6O5nCJ62NavokfGV67i0AyLJf7vnCZX66zm4wld4DhV5QIZ/kuf/kdHdUEbz2hHott7BdFh8+dOaG1eqT/aVWZn8XOOWRZQNE1mFRLlkURAkKmzw8OPZ5pF0ZG7EQ= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1449; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 31:EuMA7n6Bm2fon6NY+XuLAYaLXIb3moBbu0LVm8qycEMJFDptpwtvjJRsA9iKI4fykFMiJ/QPCB5SE+rp7SExGrLH9DssJQL+xjAsU28hJv9ER0BYRiIlvUEqr9nUO/mE6264ts2gLXGMN7As9uwXoMLpSurpCQc+51EkuLsyjfmjL1BJypClLGomkZqEpq0xOOqqIXqaQwplKiLQau79/xwLe8y4vZOHbfmNpeiKgZY=; 20:OUYC0tIQWfh1NLm3S3QD//XpcS9UhY22hlwfzCDVKPosH/PJrDlyPFiOMtDToJOWIJKr32bXIEZZlOFV+8/mVvh4FOnVIpxrlSGpm7dVo+So4zF5fSlYskxsSWF626IBlDEY3oUOhYY5cCTh7VM8A884OyOo4uIs1UwIruZ/BFx+c5aoWZZ5rn0Rb/fX7UXfp95p8mSXcWTAeDyu8oLnr8f4sBcHc69PeH5h0W6zZlSdN9U35fho5bbAO7LYxhGDovoMHVktZ+favQJHCPOvtM3YzL+FXWrxmoZjmPeHXE9ikATm8sBugWD+E2yBQXlw8lpDofndS5EJ8BeoqolX5Gn3+H1jiAJkAvIcPzys6WmIp4t2AW6IyXnLLxtLD2VM8glWtXuHke5rmocy0ZaZnxfKKrNp2BClPhYN3xcG/H8KBSvnX4doxR8+AHJIHYDzVbsi7VhxdJ0FSHxJt8DS2HuDNnOlbB9R4RHx1vfNPOm+QGuC4uwgk51LYrwzwy/y 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:PS1PR0601MB1449; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1449; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 4:KnCmEkQwa3y5+zYklvm9V0FsYVtzBNXJ6CqQ54qYd2cLXLkYIEzO8lp8dBbvY39RzlmC6bW+RIMKSxrd5Aq0waeOzNXgqvED9sg1tlD+hUnnYyEjmm8NbqMRsOWtClWYwXsAw87BormB0yngxYroxd/Tq1s63Z7wI/OYqYPbiLuXpe7Kz261cQJfULP9BSty3WaXXAwAv8htA+w+1JuHUUbFF/0qLq9YtOf8BIkQZW611gYbiIUbZdOHuJkmN8L6i9BT/fS0GMv1wKJrbe9ymzLDOHRqwN7fQGUPGgcVNTJEdjDQsQjO9bZ509cJs6Z68lRtSLzbSf2xSQmEYf251tXBEG4datBFEiZFdSUXPDkKor/Cb4g3sh+YYdfRXTcSap4WONmj1R+Mj4ga8Yr3mQ== X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(92566002)(2950100001)(229853001)(4326007)(46406003)(7736002)(50986999)(86362001)(76176999)(50466002)(6116002)(106356001)(189998001)(36756003)(8676002)(2906002)(23726003)(54356999)(586003)(7846002)(53416004)(305945005)(33646002)(3846002)(66066001)(81166006)(110136002)(97736004)(83506001)(47776003)(68736007)(81156014)(101416001)(4001350100001)(69596002)(19580395003)(42186005)(105586002)(19580405001)(77096005)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1449; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1449; 23:Wc/F+XPqemiUGe5S8306rJZne3wJWsY516POcv8?= =?us-ascii?Q?/uzj/LaEFOvqXoi6Z5oGpYY/0TaVE8ScJpK+XOOhkS2kOdeF4dpaCfYSzz03?= =?us-ascii?Q?ci3Da//cTGCkOv/KMfAjCNxNF298fC5fbxJE+HxZEZ94shf7NyAZjs563CpK?= =?us-ascii?Q?OZjYO6LVTvO7qjJDbswOs1H2Tf6yWR+NBOWzWmMhlgVoKAFND7tqZgZp46SK?= =?us-ascii?Q?DhyNyGBU4QiItUTBk3TsuddF5RqL9QKfbib1QnY84tkDKhKiIF27Ia0PDubf?= =?us-ascii?Q?G+pSWLAGgynnWB5wORaQQ4A5lVTGsD/54WL8QtGfalAy4AgedG+e3tRVEw2A?= =?us-ascii?Q?0UPTZ16Bg0Th3FBsZ+OC0xg3DbeQmwIG1cxefySCyENPOjyhJMQdksUv9B07?= =?us-ascii?Q?AOdF5vbnmWniUA32eocdBh9tG945GH2eJ8SujdPkaGLA6uD5uBt2km7Jyfmo?= =?us-ascii?Q?CgwkniyErh+gDgFaNVU97rfw/fscV4tzMhswz8WNR8FOagqdIfn9PNuNXomh?= =?us-ascii?Q?5w+FgM+xzqvaBVfoM1fUeZ3hUj+Ca3qO8jqDNsVMUDpZ8e1GQ7I6ZQLWIQOy?= =?us-ascii?Q?1/m9Alc4ZnboGjjMcQ1C0F6xfNTUmnGHTORCJw5Ekd4nGBJx1SZakcmxfvsX?= =?us-ascii?Q?HHhGbMI56LYmE6f+WTHpZIulw5LBDKgyfRs2NjLdZplabSR4y4sl51MNrS8B?= =?us-ascii?Q?lLaUxSg86LDNAkOyiN2kYRZN1WGx84vXPNJ7XY4HPhRKwRqxKDgqWQVt21Jx?= =?us-ascii?Q?XFzU8a+TdS9zFEZbBI7RI7zX80fmHUL7OID+YpTZLyEOdfRG+VJ3f3gwnYCk?= =?us-ascii?Q?5oyJnf4Zmcn4lgQ6p6tpnIXBmSyKmP6tI6HQ7hhZOFTrONaX0M2yie4st0oS?= =?us-ascii?Q?sjI6hGc/xBX92XyW+CVSqhiAFO/DrYVEktvrauqUALtqUHDT2IqWnlG2j76s?= =?us-ascii?Q?HUdVUW0to4tKXjDW2X0C/djqJM+vWcyWvoUpPQklMpVDEwPtivcm0+2jw9Ta?= =?us-ascii?Q?iQRR8HsbBQqPD9WvDSmoWfuOo/1VSCx3NN0r9zMSde2wWNe0wWsZgvgzj99q?= =?us-ascii?Q?k4u3zQWI4kPkRGUegIZmLBDtkrIZvVX6/s5TXOxc+IOrFU7TtaPmxyT0YMeX?= =?us-ascii?Q?ih8ciJ1ooBT1kZUf0epUpWaan5zSF2XPsEM0kHCECzWzGJ3gcOTBX7Q=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 6:X/4flj6FptEmr2VaM3P9qPLbMVS2X1qPpFZCNkRdkrBYPfeDyUNMjsdnX5VoPS1k2l0r0o0bYQSR3Mkwh8YLTUkA2WTNO6qPocuudHVw6Sxrgm19e70j+6TUk/hccPraf6uxEas5Ek0UkRBdxMbZlwmytsoerPqIk34xO6hmLiEmoG+nNgNN84vVkx7FEmLaRclCfSfgxBYZT6ixKNWyNWro1anE6lpfQx7tj3Ka4lPfs6GRO3EELMBj/S9vqg2EUNMwwqVLvqRt8VoRX/3fbYEwIBprpng7nyddSVeeph1Omie3Z5/B6I4oxozxyUtBCzsoSIcmmQtkiUJ3TDc/wg==; 5:cqC3RQGxddACi5FU5cG5VVHrVHZI9iZiKefnbjn32BLKuQHV6Gq6v/8RBHNx4Xjx8y2uPxzrQwAoexCoWSsVkYjVbNliErlNT2lw03K+oZFKLozJsHlNxYmIDtg2EgT8OOaVQc+77jZDp81K1PJPUA==; 24:amFH4od1fO2aECM6am7PtA15efn983hfWADWmjsum7j/BlLJMQ+4LaEf3OJBV/0zp63w8FYbUpWspxXUh1EV/E0GVV9GOh2itO/y9vQf7GQ=; 7:SOaLIAiJXVZiMY+Y4TZCBhbyPr4wGKG/RM5a3hQ0bFJ4V/cZfo2TmKi8g3cHxfTkAeni4BS0T6+B7YOM+uYlkk2P0MZl24NoFvByV31tdcwZme/OMr/CLZm/FnTiBgGoPkB4CESTZ2pvMjLB2a6b8OLglEUotluPPCm0Yo1YCHtYg4vK0/UeUku1c7aWuXdTRtN3Es4plRTJJ08obVsr4rbOIagScGcv/Mdz2vSNgqkYAhfRtgIwEHksUyZ89pv2 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 20:NHXvJ4MsQ8YGTwgb3ADb8JrH61iZZfIH69fgl5Z4unjyrTSDL0pxrI8TgATrluL4qlQ5sUis7BS4JbN+F2wnG8tZJgyZqWtbZhowZM/L/Pm6VGgTK1RS08Oh0keZosrmFSmxll9CDtl8JFUstIB/PZs1pP7gyjMgdABgC3LPLLk= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:22:51.5652 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1449 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/rt5651.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c index 7a61970..f5d3415 100644 --- a/sound/soc/codecs/rt5651.c +++ b/sound/soc/codecs/rt5651.c @@ -1712,12 +1712,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5651 = { .resume = rt5651_resume, .set_bias_level = rt5651_set_bias_level, .idle_bias_off = true, - .controls = rt5651_snd_controls, - .num_controls = ARRAY_SIZE(rt5651_snd_controls), - .dapm_widgets = rt5651_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(rt5651_dapm_widgets), - .dapm_routes = rt5651_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(rt5651_dapm_routes), + .component_driver = { + .controls = rt5651_snd_controls, + .num_controls = ARRAY_SIZE(rt5651_snd_controls), + .dapm_widgets = rt5651_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(rt5651_dapm_widgets), + .dapm_routes = rt5651_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(rt5651_dapm_routes), + }, }; static const struct regmap_config rt5651_regmap = {