From patchwork Mon Aug 8 09:19:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267295 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 5B7FB60754 for ; Mon, 8 Aug 2016 09:19:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B954212D9 for ; Mon, 8 Aug 2016 09:19:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3FF5927D64; Mon, 8 Aug 2016 09:19:18 +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 C5003212D9 for ; Mon, 8 Aug 2016 09:19:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752014AbcHHJTR (ORCPT ); Mon, 8 Aug 2016 05:19:17 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:42863 "EHLO relmlie4.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752005AbcHHJTQ (ORCPT ); Mon, 8 Aug 2016 05:19:16 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie4.idc.renesas.com with ESMTP; 08 Aug 2016 18:19:15 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 2DE7C5224D; Mon, 8 Aug 2016 18:19:15 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 27FB28002E; Mon, 8 Aug 2016 18:19:15 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 231FF8002D; Mon, 8 Aug 2016 18:19:15 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac1.idc.renesas.com with ESMTP id UAK11760; Mon, 8 Aug 2016 18:19:15 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="216937399" Received: from mail-sg2apc01lp0240.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.240]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:19:14 +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=FX1vZbBZlwHGMSA4BeDajL9LWdIwd1A1Dmu/0HtXEco=; b=bHd840rWjm9xkxBPAfI92aW4DB8g6pNqbydo8zOYDOv9FFF7BfRPXgv6Mx0MEGiTlqmXvNH97AbasaTUa7DVBy+evMk4yxf1eoQE1O04NrALDuCqjWuIesMfLsXNALJ7HwVoGihJfe7s4VQn5uTXund6LXD0c+XOn9DBgqJ87Vc= 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:11 +0000 Message-ID: <87twev39s9.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 102/159] ASoC: codec duplicated callback function goes to component on wm9867 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:11 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS1PR01CA0008.jpnprd01.prod.outlook.com (10.161.225.146) To KL1PR0601MB1446.apcprd06.prod.outlook.com (10.169.69.24) X-MS-Office365-Filtering-Correlation-Id: 3d11c9d1-8b60-4b13-7f88-08d3bf6d0f82 X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 2:GQ11ivRyoK5wZvm333wApCaRcHbthMh9MxP7lKyQMPhJYPnqqs1Musd5gn+dBO8uH+hPESXjau0LjiUXa2Tbp0Ylu26ySS/xcG36RK5qlZQhE5bm6hG1UNX0v3c/u2TjIKpAOZVfhoDDt4yIOGy7EIn9munhxjcKyGRY3rMADteKLFY7xNd1y/+7PR0IEi8R; 3:fou2bKmOx2jgNBoZQs7HiFOuX6utbOiLMBzV8CswtOAXz25SFHrOofSfex0XxlsqFxPvSisWrji91WAJaGk0CYTTHKUYiSNza2i0qoOchA2VQZkOis+jZHJPbEj4HUIU; 25:wOUHLnzAYabuNVBn3o8CWvzLi8YH+7PHIDrUARHM0NcwyrzzFZRuNpr0601XvKXy6VrsdS7ougXG7rDdqnmcWxB5v0dZjPYVExoglNZYZZPonoNFYCwxfFcrpsJxOOe7cNzS3EN/Gn/D4wNrtkOkJ0R1qnvBlwVoI5xdKDEq2bbFX0irQy9QTu8um5O4xd6A0pp0ByjOXxV8IPJnliHItbqvD/vSRgaQBoXgxc4jhS/z0iuoanbDDdwODvLg3CurZKJVjFQS25FzgLSZ3ayPFBUsMCJjHA1r+jkSye2+IFixVz7q3BmhbdMCS31Qx1N33S4RbgiC++DMLFMT39G0YHBOh8oVkn6zeP4Zd5st/LyZ7GZ1Ru6x9gYwqBtp1yxk54wZNYYR99jxvieYPQaPlR8vhHX85jiNV1NlNhJ2oh8= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:KL1PR0601MB1446; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 31:w322M708oJlnVcLdTejxi1UBiPiinwPh2an7bZrKvW8tJxDXPU5D5gXU+bj21/4ZhL/eou9jY0RtWWLdDowNucQA86crHMS38VaAn3jwufDWo5hNYbKZ0iKcN0kQ7MeSy5ImXO4A/nqhWp49p9LapNl9qQojExtWbfEi2+KVzsV03po6+ZlyhdiUTdOfC+sq2JlKV6YTXCQbIgny1vwsS+FxtFRhZFoAIjHP2I0X12Q=; 20:7JgR8+4nWBNp1PcfHmJxORh7IY0wUcpZFeTIOHkysol5S1WtdFYzqpykeo6IrEJwDsZV3Wpd0mgQbauQEcYevkyTQfLhKRMpm7EPN1UewcMd0bac6+keDr7rRf7fYEmlRrIGzw/VNJoIX69q9UVH3zVjUSwmiW3ut1FwdtS4UZp8RQF3IWgHrxSbdpViyaeGMAOupsabbJAkEEd/2AmGcghTSneCJxLfh1ezEDBm6OWWG9HMCO9y7jEhi/QGeEJviEy+2rKzu+4GwnITJV+gD3sXaQE2WeC6Z4nOns6DcWJIlDcZEw/Je33Kh0J3o3DHbW2GNrkuYc5bNdQWmmnMi+5hCTJlrZ7NvjaqblTAxQ2ZQ3dF8SUDblxCsxvtPps5iBRX7N1QaSL4Q1HyklH0E9EZUO2z1uqfvHWiXTMxGP0inbSSFkNe7/Nw3D+DUQEy9F8ZQ1gMSbJEWXxOdlS/F1TVNQGkdPKqZRNp1b9GGF/54rmsLkJaLVsBC0WDuV56 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-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 4:2J20M4Woa8tlX0df9kXeMkqB+pZtxg6oiD/PFi2/1SG3HbA9z6XG/DcJrbU0Io06O2A4vaxNBH6vE7PFLrrRUZS816s2NhaYkIdyMA5lzDQDssbHy61ksfTYraQarqPOZLe9fhCF6Y6W4f42LqOI8KLDY6hlCg2WkjJU2knCwX99C6o2VJK+nVHyJhGMZrRbBudfpzH7jqw0KgkC1RXdZQus8zM9ep8ABJBAxTy+Osa2WEVqSCTqZDKWl5Pg29+6DY7evB58OleiJndKuGES87k3coBZETYCClTfZYA+xo+ccY42NWgDT9HlnUCvgxv0ShQG0eDdNsxkuBfGkjTqsA3MP8wUxq0QCGtK1DYoeNHNqeH7lDf9/R18ZYq6LLKImqDMmEcWrWXdmuqsfGToOQ== 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:IO9wwK2SvBpam4CGFa8WEJ1IEVBgvW0OhPuFh42?= =?us-ascii?Q?ubUptrOfW1UQQ6mWb/SnqLvqZ/vCE1/zXJzoqWJCvIVV0T9EefA+HUsmVHzw?= =?us-ascii?Q?YGor7cW4OtBI0e4Kh3GB9h8qDwG8NYl8WdXOyaJGP4O/hM3Rvr4N1HoBuAff?= =?us-ascii?Q?U2n0tgR+9MOAEulDeiRkyTSK9gzmvlcBHlBEnIDq0HVa5saVh18HLSzVPIUy?= =?us-ascii?Q?m1JRYJ+Bb876l61A/Yz+US5HBxlj+RmsVTGNF5th8XJAZOwoRGeSFzgcUYN9?= =?us-ascii?Q?o5kHDa9k5U1PogHG/WuQK05jBScAm5D7rQbSDyF9t8Xy26X6BVFNDytDpYWV?= =?us-ascii?Q?kuD6nf7Pt4MjBhvvZ76yqPPMcUjcc5j8feOD2IHyvUjLgYvifOtR627F0opX?= =?us-ascii?Q?PIt+J8UNu/15nMZ5Ma610xSVl1mpgVdrMRdEDlBU0uRw7vFZNGxZJ80RUFXW?= =?us-ascii?Q?52JU3SL1YWItOQEmbDuQSai7qudQDcz8YBfuSbpzdmyLFiG4toFGv/ShMXOd?= =?us-ascii?Q?ZsBnAr2xXeQMhb5MxqzdXG9c4TT3kWLr/aDqMNMWQXKOKyTI1z28UkeAOALN?= =?us-ascii?Q?7xfsHQf19MVXNUBbcGAkOlCeYcIn+5NUrVFbsgXlte+i9AVMebJLOi3WDnJt?= =?us-ascii?Q?+OlLqrM2js+bpWwEoLmYHlECVb5JPGI0tasILl7spGNM62kjlTHqVNLvCZtk?= =?us-ascii?Q?EK8CR47blEuu7QhkYsXmvScmTF/E91Yu0EOS8QXIH+KqN9edRb+XcyYHRK2c?= =?us-ascii?Q?4sA0S70Ix3uEHVgJ987f4ZLNFvYYJhoyGVq2dF+qxQwlJ4XImKa0HujQZhCA?= =?us-ascii?Q?HelocLYlwwQNqFeTvsUxRPPdrkrp5TAuo3Ws9I1nPujVpqDK0VXWg38xqurh?= =?us-ascii?Q?lI3nO0f1fJXAvzIhwG9Fah/mz/ZS9wN/7yyLaBE3UZBhCPfYSOSanb9pQP2C?= =?us-ascii?Q?I+7Kj55B0fdiweVmnZIChj78oRBj9Le8j7jI9hmSE+lDGy8Eunb+VDfE5Bom?= =?us-ascii?Q?NeI0bNBiiB9bH6E0w9n/n7tgD1eLVtl/DgU2quoDNRtC6jD4GKkNq3UPn/ug?= =?us-ascii?Q?den361rHOgSDxWJ4O7uOHZjfP6v3bkqstlshAqboHL51s1sUwdVDsvE8DvBs?= =?us-ascii?Q?aquMbVmzRBtE+4LKidvTUJozY1JUzL9RqcuQbvjT5Gsp3+DynJz1m4g=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 6:LL6sZoH9aAOa5sAXqBvn0j5TFo0WpcjQcz8RWaIBLWwgqxLFgL8ceU3F5FD/Hd6hzC9vBCEac+Lq8qQq4bGSVL+a85TRn5p/CJ7eDue2HXv6x/VyH/3cpPTDzlhdu/R2Qf8feiBaQQQZMCedHEGskx3uOPhdFUROB9eovy/9cvDfnqSc07ncwrmV7g/FZYwxQNHhvFnXY3VPM4+S5K8eUoUSm/kDbKEq5NA4Y2qY12qrMRg19/PY5gDiCmppw1BwGnfVJdVS6nO0LXnGTK9VLYk2Xg56jfxTyj+8k3eJfAkTyvuxpstNbMEpF5LBX4JzoCEArxZVfxaTuzHgAnsmnQ==; 5:Epn1l4xh+Ou/wK0xeEmGjxMcCCjhYNA2fvPsFRO2C6hy7ZnoUg//QSO711DQZjXWYuM8qNP7ig1SxAT119KJzf5Keova3/wufZJJIpXoDaYg+jtTOm3Cc5U6oo9Xajreun0+dozmF0tTIsYEjJRjuw==; 24:yrakkHD6WksCBMhBG4oAqRNgNO78JRaMioMG79J4MON1pzHtpuXgMOt7IqudOcOonmPd7qXL++8Kxp0cRWhKPWS9wEgbB9hwtZr27KWKmCM=; 7:TQg2KPmyMPOA+23DKRyR7fsrtNXChhl3zVgCxV4WzDCjRg0eqqIXjUteN/G/CN7pj5FtQNLax7uU1GhecqeQY+wU9GUeOjv5QsP141+zaX2MFsOXM0u2refXg3JVL8hYBQb2Y8cX4t+L6kpC7xy3YGVYzKTJ4kqSU+Li8Nly9eMyhAEFqgoevrTNL2kp7YOxYleA1VXRVSJKhAhqGZwSfMH5SJk+R5LDWRBS16UsAaNzPxNhAJssIyhcq6xYk2Gd SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1446; 20:sL/a7FGp8oq9SoC2Sckk81xTSvrBoYaJ+oTMM3FCyJZFoG4CV1PgzEdrBl69bQr1vZF3Ao0disw4KBf6Qhz/q8OEDS9hvUSXvXcH31MpFs8bHvOv/rIuDYuAxJUPf67TnY09jES5erCGq81FuR42/CwlM7+tAUM7UclsN9/vHQI= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:19:11.4796 (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/max9867.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c index 2a22fdd..c967323 100644 --- a/sound/soc/codecs/max9867.c +++ b/sound/soc/codecs/max9867.c @@ -417,12 +417,14 @@ static int max9867_probe(struct snd_soc_codec *codec) static struct snd_soc_codec_driver max9867_codec = { .probe = max9867_probe, - .controls = max9867_snd_controls, - .num_controls = ARRAY_SIZE(max9867_snd_controls), - .dapm_routes = max9867_audio_map, - .num_dapm_routes = ARRAY_SIZE(max9867_audio_map), - .dapm_widgets = max9867_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(max9867_dapm_widgets), + .component_driver = { + .controls = max9867_snd_controls, + .num_controls = ARRAY_SIZE(max9867_snd_controls), + .dapm_routes = max9867_audio_map, + .num_dapm_routes = ARRAY_SIZE(max9867_audio_map), + .dapm_widgets = max9867_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(max9867_dapm_widgets), + }, }; static bool max9867_volatile_register(struct device *dev, unsigned int reg)