From patchwork Mon Aug 8 08:46:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9266969 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 F19B4607D6 for ; Mon, 8 Aug 2016 08:46:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E2AFE26220 for ; Mon, 8 Aug 2016 08:46:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D707E2793B; Mon, 8 Aug 2016 08:46:49 +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 2B0F526220 for ; Mon, 8 Aug 2016 08:46:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751320AbcHHIqs (ORCPT ); Mon, 8 Aug 2016 04:46:48 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:56485 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750846AbcHHIqr (ORCPT ); Mon, 8 Aug 2016 04:46:47 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 17:46:45 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 4050850DF6; Mon, 8 Aug 2016 17:46:45 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 287B81806F; Mon, 8 Aug 2016 17:46:45 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 218BB1800A; Mon, 8 Aug 2016 17:46:45 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id TAA11652; Mon, 8 Aug 2016 17:46:45 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216934454" Received: from mail-pu1apc01lp0015.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.15]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 17:46:43 +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=raioSfuxVdLgQnkVZ/2PtEN9J0V3izB00aSXC++zcLo=; b=B2InRlLAK1hA8EZZDLJckFF43PAvrvgSXfhNDnjZ5oLSjx6QYZXiDd9CI0Ol2HWl0LuoMcyhsvHr3oYoiNr/eGt57Lb35+3kiOdUh9Qi8hkYTimNFNMJm7MYzH8fYMq3OiCVvgb5ap/TlyMyYwdQlpO4z+N/rBaR2/n7zctlI84= 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 08:46:41 +0000 Message-ID: <87vazb8xk6.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 001/159] ASoC: codec duplicated callback function goes to component on sun4i-codec 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 08:46:41 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OSXPR01CA0034.jpnprd01.prod.outlook.com (10.167.143.167) To SG2PR0601MB1453.apcprd06.prod.outlook.com (10.169.106.19) X-MS-Office365-Filtering-Correlation-Id: fdf8ef1b-ca3f-4303-2a79-08d3bf68852d X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 2:7geULoAbw619lPX9H553lSyHQKJvzbsWOD9HwINlReFnjK5IDaKcj666iiC/WH++8plp7kw3nKQB9R2mahS4nQo1mI4Rr14yhPzvh52BUZvewZEZfhX5kaJUlalwnyXVpgWCt4tkw2nD7K8vHWgIbVNGGQLehLXHHn/GbxaEa8gNGPPiRGoSpJJvaaCSyqBP; 3:W7H5huc+SnPEMR/SsR++pxmeabYd/VMWbOeko0zd7s1Ps4JT+nEA5UXVry3i/0SMqq/gQmw538pZZCkIQvNKkxlqCdQdE68WjhUyeniEjkMpiGoCt6lahvLOxjWfiUY4 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1453; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 25:y6rKqjQ34Bm9IQV2HkoMIS4N+j0zGe8U874KAI0G7eAO8lRKOieL/naahI8VbhunDdMti8ZFsHWSWa5BDEK/8w5bQ9WfVw4XCod6OC6YjfDLq7dO+r+1fzVYIYs9Cu6sXkcbmDUtrz3R84S8zQ3tbDuf1cWoUueksHJce9tl7zS2e+2A6mUsYM5TdFSWxdBmDHjqPyKs98hVIWClL/h5g+6gP1jEmyf8ZDao02G5b5HFj9jbmINBgCfiJRXS+bcNC4HVQXotjW+/sUA38Z+QPWo599NLyotu2g5DfZ4daPDMLY8BuvV8rRxSFsRnZqSojFl78OtT2fCkSX2OS0yYEXKd2pmBD/BOzeRG3orN7yhhe/caVfWJapctoP7FzYNVWlJt5wZOsJWAHA0LF9yMxN7hWQgRU/noRUN0zduvrVMO2MKgSOyFohNwY2UAs+37zWxn8OFm3TvbhOmPk5HO0taEyt7FHDM+OZhkyavL0WnVr7tZUfH9NU+iUpzd9RhPmqrcvNfKUUuX/33KugeYnsE5SPOyGUFgDTxMLxqze+pfPJu8Umu0VIJQV+IMvQQb6dA3we9sJ8tY75IHadZoZikOXu8S9gGh0DFhvJOBPI0vAkNBfoaZMfbbi7ULUZUReurGzBhwmNV4eBRv6+urMfIZRJDmkU5Y5zMk3QszyjiRpzARK29XfJt8bS9ISTuP; 31:QLUzFupkltJMC/quu1NWBZdc0eJZ1b+Ops80iMKL9Mt/6EmCvj7sRLxvfwt0f8v/vnmgoH163TSC1C9+nS07ZRCxPEWTWQdQEljTkpyXmKiQFN4Tzu9ITpY5O8IApUD9jp4XTYa/oLN9FvVfNO2EuLG6hJXFLDwdMaLZFtApW22jlqsO5UFZxjIdummVq1l0RYELZa2X9ZQaj8NqeMMWHhDnUPcTCFVfWio psXX/f0I= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:2rhvaDn1ncRuHk1qDqUSuX0CPO/j03MWEMSR439zDLx7gu+Ge13A6Jgh9Y34sccoYbhaxSZaDEz/s7zw+9REjNl9JSN5+iUbN2nCi4d2zSMYPuGcLt6ZYr7dKOMB74r2Vj0Oky8+b3x5M649xRB9gXYzJNwDd2jU8Nt7Wn8FKrS17JZ84DGyhLadD3MiXBfqklPzEeMLc6WGaG4G/e2Tfp+0kdcUpo01Y4zv2dmrTZdkrDkcrZcBQwm9ag7sk7vCedTWABcVRhPugYb6AMaNkb+c4aNXlGVcAz5CdSUgWjq2T5CHVKvo4TDVqlT60FXtX+fV1Eb91WnB217ToysfNq1XKOv9tAL9s2wlCtLVMnWgytKwZ/c4tpwUAgKcwkz/rG7kie7uYG9y9Cjm0r1Bc3UfMjs4pq72To2dIysn/MGc7Lqg5Y1zJX2LG2pC7l8aWVx+xvH76POwct/jUdhU6FX5nwaZAXSqsGBX9M+F4u/rRys0bxF45J7F4HVAwucp; 4:e+OEysEGGGTU1/39qJD7zZYUgxwiMCH8yJl64PYFWccR+oikg+SE81ZTPoJkBgXtyyqaKW5pNQYpZU36i4chVC1w2D9M0UqpzvVEPM8D/o7ZDfgsZJYuiWFWeMD1kbYMF8xRbJH5edVl0PzOLRV7gfzbQr2a7C5fkHjAv/7geG6pYmznzMp39knusHVxWErfMybOqldNCSB6lqJsmsXHW3Jz/U2f0oWoiyYBDE9EGSe3i7fqBfgG+wiuEj+g8XDov+a0r4rFkt6HfJnedDedDtvIP8cgj9Isrf8AcWsV2BmtTeJD19pPoze6/vmIqAKMqy80JXDXc8NFbxd/01RXtQ6knahZhv1pAoCAeU8bbD/dXgTSS92B7/qg272GG6C5AIrZozpziCMQYalwq0kCZg== 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-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(69596002)(101416001)(33646002)(46406003)(19580395003)(19580405001)(50466002)(83506001)(53416004)(76176999)(8676002)(50986999)(54356999)(106356001)(229853001)(2906002)(6116002)(81156014)(81166006)(4326007)(23726003)(77096005)(42186005)(2950100001)(68736007)(47776003)(586003)(105586002)(7846002)(86362001)(66066001)(7736002)(36756003)(92566002)(189998001)(110136002)(3846002)(97736004)(4001350100001)(305945005)(32563001)(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:Axgg4Rl2Rk7chIfnIxaw+pC1y52OHgMOgL0OZCT?= =?us-ascii?Q?37zO4ExYQlbUsH5XBW17h+OGYNVqdwF0M/UQev7i/iUjMQe4J9vQns5WBsXp?= =?us-ascii?Q?Qr5EPTYWD0DFylnV43Z1GQE6qlUB0YjvY2rQAGcmhvTM/K0GcbhLs+5J+nC3?= =?us-ascii?Q?cXPx91KZ6IbCaVX0v5lETI+xf3u7YlmvadBQ6RPPLOnM8/JK8vfxwu7FK7za?= =?us-ascii?Q?0oQ6z4tDSM8kZbZyqSxcZ0TjHu5p9WJ8lRw1fQ4an1cc4/roxEANJnjnGZlJ?= =?us-ascii?Q?Dvo0n1l2AuvI9xC+R+BKhBZv37z1BnBBkEorun6Wq3jOkMroNPpmYxV2hVof?= =?us-ascii?Q?Nk5YYjTNmO4tjqtwZg+omwhpHnXcEEPV4aHwcGQH+EY7e2VFI19rJEUq72Au?= =?us-ascii?Q?Dp2RHMUyWW062yMKZzbDbuK7O5SoIX3f8egiuwtKMEM46j2eUBuDZkJradmx?= =?us-ascii?Q?ExNFjKEmeqxudg/kBL8OQaHCv2voS2jABziUqjHZdMWO25gJm8/mSl9Pnit2?= =?us-ascii?Q?7mH38i2GaVAXG6f2Z8QWO7i4J37mT42YMC7EvvwqcoVK9MfnUG2wgBzbXWmT?= =?us-ascii?Q?4kZfUD/K12sW6GPoF6gD81s5y9yLyg8KX5/d4FWHyW00u3u2Ux2j0GxPwsRa?= =?us-ascii?Q?1z7XZCIL9p6iH/xvAs2pD6TmzINJFdPwv3QdAZ3aryVpZR34m6xOmghuTa7I?= =?us-ascii?Q?74pMO72Snls6y3hHjsPtiuFeTdvgJWGgQDRpRlX8ZGU4XXR8g7U4Z6upvtQp?= =?us-ascii?Q?eZfWr9P5QuqPNGYelTs0LEhS3jMWaowyc4PbyY/Rg5X6qY+uS4OcRCMhGjIj?= =?us-ascii?Q?bWLWRyZrw2uCCkx2a16JsUP5+cFED2uuOZHK9h67x66NmX3rnalbuGspr2kE?= =?us-ascii?Q?C9tkTH0A+DHs76y9B2SHisuXfbvtXsXxaBVRanw4O34RahQEOS60HvzzIqwo?= =?us-ascii?Q?lsdLsPGFyk4b9ipOF7lm4h/tgquQl5tI8AmCn1kocJQ09YLaH1RXw74SWCtd?= =?us-ascii?Q?YmUxf1nNcmGQ1wweu5GlyNaIGSB20lWwSL6uA3vZJdIMj760hm2lBeKoSI51?= =?us-ascii?Q?hvjYxexZvg2b25K3CwxRKJ8yj7SCeCwl4Guyo0BQo0wR5+cHqE5QaQ9XAFdC?= =?us-ascii?Q?7WjX/MDtXrfuHt41aHJ+dXImHPgOjejdR6InKMMN7VPl/DwD06cA4gubxRmL?= =?us-ascii?Q?g2c6eP/prylFLa8s=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 6:7WhWO43gVH4KxFnbSz1Hw7T5KY8pN1w9Y/upsMRsJGjguKexZRYjXPCTyP3j57XehmknHnR/hymE5+Fcr4KGrPpuzg3REVTUYY+0Y/AnhhM07USJZWAwNx06A0cA3pqf+kidGMe9G4DAIbunu0rtNDjS+LWaLAdqvZlWvqbxktTA72X45wdYuqgHGWqchiSDjiMQTW+Cvv5V5NrHyziQtPjy5LMYU6q2nEtovBJ4+NbJPJ+JmlkU+lyfkAcI0lKUowgLaHjmG1CTgjN22PCgeECdPLkEzDv9CBBZRcGgXpaJMw+jF66S47nvPVr+glzyivTKEudSKu88HwKoEz7bKA==; 5:9sKu1XT4tYpLW0ZVahVjmme51w7dVU5BS8vbHRdGWJvGJ828OvhgwUHwyXy2PPAcHoRNWg/KjAhvjrmnO3+8hLIySQKP6xJ1PoW94vuxW4y0Nrs30pDCaAPNQRuu0lvsazGgppi5CszuN4Kt7yl92A==; 24:6x3+tB7vkvI5fMo1AvYtWKGujI1T92hR8fXlZUj9qQvgdElurJAhX+KEaJoSv92Bvg0UYYGWFavoRL8zbfu8RD/81oy9uILhyUPBAOrBxcE=; 7:Av3guNZQdSkefcP4+4tH4bKv83W1WJJXj9dTxUwFmEyOuUCCN0g6ut305kNWiULMTwrS9jiL+w4Q+VOPVJ7c+H42KyGLai+QFKZBp7uYxBV2gWz4jB3xf6OXovI6+2oSJisfAEvlQaU9B7C0T4h14tFCwWdKPDKe6sFvCs1PfHuVLuhIQDeEwYuOjjQcUlsShgbj9ebM1wNmFn6b0+YskK8o/yf/yl5LsdpamYOu/eoT3SQJYS0lOVsb9qkYf92b SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1453; 20:C1LLvBCmAcEFLiQ5gUlMdc6Bd2GO6A2j3nWkQlaSBASKOdidt6RiZPy8qyZ3oPxhuC8NZd6mVjHhDzy99y+sVPuJFJR2Rj3S532gSmTpuuBVSaO19KINlxQ2hTCw8hkR05HM3sQk6ePrIsZvxUGUsMtx7bTxadHVcauMDL7qyUs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 08:46:41.4610 (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/sunxi/sun4i-codec.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c index 44f170c..0e19c50 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -628,12 +628,14 @@ static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = { }; static struct snd_soc_codec_driver sun4i_codec_codec = { - .controls = sun4i_codec_widgets, - .num_controls = ARRAY_SIZE(sun4i_codec_widgets), - .dapm_widgets = sun4i_codec_codec_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(sun4i_codec_codec_dapm_widgets), - .dapm_routes = sun4i_codec_codec_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(sun4i_codec_codec_dapm_routes), + .component_driver = { + .controls = sun4i_codec_widgets, + .num_controls = ARRAY_SIZE(sun4i_codec_widgets), + .dapm_widgets = sun4i_codec_codec_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(sun4i_codec_codec_dapm_widgets), + .dapm_routes = sun4i_codec_codec_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(sun4i_codec_codec_dapm_routes), + }, }; static const struct snd_soc_component_driver sun4i_codec_component = {