From patchwork Mon Aug 8 09:26:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267775 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 5723D60754 for ; Mon, 8 Aug 2016 10:50:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 472B52793D for ; Mon, 8 Aug 2016 10:50:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3B7F827F86; Mon, 8 Aug 2016 10:50:54 +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=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3FACE2793D for ; Mon, 8 Aug 2016 10:50:53 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 37EF72670EC; Mon, 8 Aug 2016 12:50:52 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id AADA52670BA; Mon, 8 Aug 2016 12:01:04 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 04CC92670EA; Mon, 8 Aug 2016 12:01:04 +0200 (CEST) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id 3282A266B70 for ; Mon, 8 Aug 2016 11:26:39 +0200 (CEST) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie1.idc.renesas.com with ESMTP; 08 Aug 2016 18:26:38 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id D74D659A83; Mon, 8 Aug 2016 18:26:38 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id CDB0F480A4; Mon, 8 Aug 2016 18:26:38 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id C852E48014; Mon, 8 Aug 2016 18:26:38 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac4.idc.renesas.com with ESMTP id UAJ15885; Mon, 8 Aug 2016 18:26:38 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216937983" Received: from mail-hk2apc01lp0209.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.209]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:26:37 +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=QU1pRSXEWUl7fnN8TQnS4DoUs0mb44IgW24td1yrsfw=; b=Y8YUq23tzeHGgEU4w4d1awq4necn59YpdtJFdiS1IXdQie2WMMApJMUPs4IiDuYlJtJm1scAN4ZbKKKkODL3VKZyRhg7gQDaO/ADJmNsrWBeSZ7afHZ4PG+8tW7hSEkaQzNZ49Y4OS4xhHqZVr5BnvH9YxmB7wq0kalSBKEwxEs= 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:26:35 +0000 Message-ID: <87vazb1uvg.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown 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:26:35 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OSXPR01CA0027.jpnprd01.prod.outlook.com (10.167.143.164) To SG2PR0601MB1456.apcprd06.prod.outlook.com (10.169.106.22) X-MS-Office365-Filtering-Correlation-Id: 0e2f7a1b-99e4-4fd8-277e-08d3bf6e180e X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 2:m3WDy4pH2Kt7mqW26yrFfxbbhegSb8ppPpWD04VzV2vZHkypUAF5zZF6pQnK1KKOwn6zT2onhiUDas366GuWOpm95au70Q1e4l1aWoHkY0IVi+l5am2NKZS2vdJsSCsV/VJdFH2nUA1t+mrEPEYsQP1bxRHpLBkam4aeST2TPF6V12jO4AzG+meGc36dlhmT; 3:AOfjiQiUkSGJuHGhwA7NB3OCJBMopZ1hQKp/tqJ7cDJ6sSWwt+oSNuRTIJLb3f79x2pmZ1FmLaFHsQPf2Trq6gS2DvyUZAZTMK3YB63ERn/0inwtgij0KSCMXIHLW/wM X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR0601MB1456; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 25:fqcHj2cyHd/fxMu23b59zFNI96VwyQmgjyrDTuwcWxxvpJ9kzMxQ6m5cZvk7vaPmMi6pMd6Sg2xP9B2WWbY6TCtjK4YW7U/Roz3NXhlyGQAdEkNN44ehJj9sLBlV61/SXMhk08U3WnQvRp9GzYK6scQ8gKs5gqPqzfMib5le+iE581aXADjt2xHy4yzvlMw95iJRo3anR0L6BDNNjym+KjvKANBnRjvq2uN+yI/pJlQYzJ3L6pkbkiTAFZOqsJowE4rGYak4H1WnGrYpy3/JKjMnrjPFonlRBITyzSp8aon3FMcn96JerzOSXR90r9z2xvNnfeM1u6mUxeK2VxyYpbxMtP+NY/O/mEexTBXv+SYzloQ7PLKwygAUm2qRLPxNKqt9Kz4JRI/gz0rToMSbtxHMkmCGZ/rGGwJfV0aref67/glmVR4WeAiKRR0qnyE0JmJfkxf441NlHFGOsWl/TlEIFiNt/LYKssxDc8BHpuM+wnpd3QcDDuARi9gL77jl3viayw1dlbmGtN9U8I62ZsE7oURl8q35DFZWYFJI6XPz1aNQbC3KqiCNfGUJqc6weJVOsqOrzMFd3C9Pu/7HzTvjthbP7dXsZjxmTPZcne8q7QDPoMf0Vu28LcWu1lhDH6Zg0XJue558uZtcrn4gQpGWFHfEPQJbCWZYIKiXBNgo86mSGyJ9hdlco/07buMS3EOvY8ZeusmyT5biRDJTZA==; 31:ia7g0HNzInc2o1nkV9wSQQP09Vv+Ed/QPxQ1u5CRSG6gu60GapPrJh0Cr3lIWDOUEbQRLRMpciuXJDUrMOL+QmCTAfk2arwZ4acORQ3UOS81viIVmT47Hy6yh3pet5Nzfav5Updzr/CWn1ScLJQUx0+mu4P7YJ+qSqNiX9ihqlPAEaL3wAsSRw34gs7ds6bFOS3PSSO4EgzD2884iqPZMMEjdCdlTjQlbIxg336ZTvs= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 20:smDlbzLQb5GrhXYJuiFQuswUPqo6qOajtU21t+SEAHxNW+OkdeRuiB3eQPtE7owpSHX113/3UHxZJM/sNldqekvDobVO3tAdxWfM4J/FszJ2tc3lMNWHg74etMsuDT+XU7Cwghqj+IODYLWDMqcJRPz49Lnaw2PQ8/JPMOGdsRs7GBV+YikXA7/HPUjnJz5eXRoYq8PZeDqMGLtRXuZF3UncdGrS6hyErZR8wOs78TV438z4fCK/gnI6ECw/trD/SVHQX7n8jMrjHGRzTd/3vHONHbpu3ijaPvp5P2vuEuTqL4o+AcjK1Z21Hxyx3mXje6L4jTVpGQiCqXMYkLh6TSeO9AEUADoZbe7sl9teXEfTupq6kXqhK6ejsQ7GsV23zkLF+9sYNCJKRwHU4dqu5ClaYO1czB7UNE78D8YBEvtWjj3L0DQOKRqi0xx/ppq6nXMCnq5aI/20Ya9hQJVUQzijbCAClXuddw1h27505IQTrHPC+mtjpHG4YWXVz93n; 4:skhaJ+r++w56MgdtkQiJt/PuM+kft/lIbFJMZX0xNzaRhN64qVJahp3J7EGhJUCkFskLPMF1f+CV+NvVam7nV7suW3uwb7t93LBQpI5Dl7y2gp/o2lrcFro81qnrtS8FikakzqVg5BAGa/2uGwPklsQBhya/UqmGJ1X/0K586vYHv9EhyaOho9DhhCHUZuwnSoQuW+sFWzUgJKuRLJNdOmMiZeSZaZpC45k8QBwHmeVdIlRwPfJTIS+Tjvd3Y0fwbR5Bb4Tm5y6e9E6vsDcwEe8HFkhZl65NtDw2ZhjCAceg4qT/NDcxMorQ1l+kQ4TfuXZd9/3UFdEzpr78Tjuoz4PQjNEB6ifR+34GaYknVVnLjtL7nF8IAXtQULG+geVgV4wFtKj7OuZGgZ+0w6yusA== 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-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(105586002)(101416001)(53416004)(4001350100001)(46406003)(42186005)(66066001)(97736004)(47776003)(92566002)(50466002)(586003)(7736002)(110136002)(36756003)(189998001)(305945005)(7846002)(86362001)(81156014)(81166006)(3846002)(33646002)(2950100001)(68736007)(2906002)(54356999)(76176999)(50986999)(8676002)(19580395003)(19580405001)(6116002)(23726003)(4326007)(83506001)(77096005)(69596002)(106356001)(229853001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1456; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1456; 23:NXLb1+7tEqhhjfGykR7K0uoN4lgAlnlRCq6ll0M?= =?us-ascii?Q?EUPBVeUZ6oVL2lRi+oQ2KACcpWqV7d5yjTwRVGBr6Nm7cxO8gW8QWKIFIhK3?= =?us-ascii?Q?cuCfqT682qMgAUQ+wboNrHAXYeTcKygMMhhZ+r5GLF5rXpZKDmd5dKW/JGBh?= =?us-ascii?Q?JSvsatptrHVWjuNseGfAiQpLMgkil5vdCWGZtGI++m8q0rWW6Mofjq5quHA9?= =?us-ascii?Q?BSC4j111iRnNX2hR4n6K09Cj1sutCp8H7S1e/THtV+K0IyStovLOUrO3Zfai?= =?us-ascii?Q?fzm//Cq5ZJYb9vMr9NzUvOpAZPOFPaS/HdPKEAqb58l8Gx6UPr4OYMdmUl7j?= =?us-ascii?Q?5a6UjlND0fyLe30jXaUS1Z+86nVS8C0C/q61rbBLtDi3rRyI2VqNNFyCmIYn?= =?us-ascii?Q?jlLsDli7kva5L/GtYPTfm4UCLfNiTEDdF0NY7sQAw+EQpMrSkNy//PH4Cg1T?= =?us-ascii?Q?k8acoLAQTvjTOqacM8LjZSbjP6rKK1AeumUbEPxRYq+h1fcr5jM7IPtRuQUL?= =?us-ascii?Q?swZIv8znInfNov6rpT4r376HFAYlf3HoV3l2ByHBUVn+C/KC/+ZAedT4h395?= =?us-ascii?Q?QvUvDFNcrR2D8HAOkX+axnsxyhCDeXT6TFCi6HkeLlee+dbC5NXvXmwc7mI5?= =?us-ascii?Q?aB15sxYC57mIk5SDe7jBvhmLtlNZYMErgu5v8vKCTJep6I0qtI16wvG1sA6U?= =?us-ascii?Q?+qzPPubhTyBUYhdSzeCc7WnQvW1KChMdHqQVCY3lUPwrqO0IL+hHBnsF0HHA?= =?us-ascii?Q?wtokb3ZZiN/FYEcx/LiAyxZD2FJib27QXGWWJe370vFUWNEOnVL37VmSJI9G?= =?us-ascii?Q?jAyTmMzNlzm1rrqXvbQvPeQkFDO0H5ogSq+5yXzTvZkiZH9A4gOddfUc8VSm?= =?us-ascii?Q?+L9uNjdNxw10hXLXiTm28UFMAjtIySckzGmWkrL2X1tI4Fs4AHpHUsCpkIG3?= =?us-ascii?Q?VQ0r83+I1JBK6nypUm8p++FMcuOIA2whEo4UO/MJE4NBj+CMBmQrcdYJbZ7H?= =?us-ascii?Q?qLMSunawzJO/gvlBTElBRIrCb29h5vLKWpD+dHx8rpSNOng+2hVUF09rhrls?= =?us-ascii?Q?E2/3JVZWK2q4RYqOzQ0Zo8Y2uyBg9sjA7oerCoGUTF6CqoCgMJzJ2LZO7ad/?= =?us-ascii?Q?UU1z8VmJ3sPgCyRnLQW7aI1ahEhwiDaYj7sWU+L5P9rZAG4+l4KoUjQ=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 6:rJZ4BR4BeKNjtF0uE09yLQCjJX6iOL1PZVp3RCVcILAhtYunyrqM6ZQJcJnWr8z6X+hOqe1fcQWJuHHA9DvKZhE6zQD2hzn8x0Ba1NeBI/qs1RclI5a41ZwrVaKNnvRQzw8ev5lpFExVGwG2xSMWTDLVppwNzp3S5lNcocJEWplORPzPvuSrpFaAX39gnf4BPnUrgwTyP7+mojmWO7CaY1IjWiTNWninkSLxkkrRsjBBDlewVCWwXpH1zmycVdCUbBYgSwmWkRaynL0c3AvLxlwmeTRlX64Si7Pl+tCihYLfTrfYzVa7EabU3hkq05FXBU7i5Qj3594gOOmr3SoqEw==; 5:5Y5wKZlt3R1zYaEy3QKI/OsS7YcIkB/GAcbi3NyyytGfk/hVYyhPapZlGgYSUCJ/NTqNjf45PZDI6bqI8xFrSrOjqamHohS2kcymP0wtX0/0/Kx0GprFvOB50aCKYteQ5sgqzOuSZ9A2xVwyQuBpDw==; 24:Va+rrcDreVzC40ISBfEss/VWwBjbcau0hWahJckdvgWrZciCCXTML/VDvU5IjM6R22xQisnRffZTb5gfZ4vvV2LbzusBUF4ngsJosjPj72k=; 7:qjzphbH4LcoVKL2UxlOUTYkAo0pq9LKIU+WH1FYXmh/A39KAid6+ULbz22Ru9qwgnbj/DWWWsAomcWUY+FhbqFSySb4p9JfIn+OEHUJlzl/f3pzr0OlCcDTS48lIi9duN+Eaz0+mn/q+V4TqtHYdhqNEAxS6hluEfA0Q8+XsIokS0wLLc1JCA1x31Wbdm0HZPh5xb38Sj9GDNk4PrRQI6nfVUPYKNI9z8jORhx9Sd+km+3nk/1tm8MSmr5BwvO2M SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1456; 20:qQKN+VP/09L9WTsEG9SOEXYCCj24dfMLYYvQaO2205RIekk2DLftmvnZ2aYupVla6uVVv8iOdEptrAwfyAw5UNmR7NoF/lrqEPK13Pl5hoO5seHrOzJue+lZUNKfHBkNnZWuRMzjyuCvZEPzB72JDsWEmCfo6LBEvYTUNE9KdVM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:26:35.3645 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1456 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 126/159] ASoC: codec duplicated callback function goes to component on twl4030 X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.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/twl4030.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index a5a4e9f..a2104d6 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -2199,12 +2199,14 @@ static struct snd_soc_codec_driver soc_codec_dev_twl4030 = { .set_bias_level = twl4030_set_bias_level, .idle_bias_off = true, - .controls = twl4030_snd_controls, - .num_controls = ARRAY_SIZE(twl4030_snd_controls), - .dapm_widgets = twl4030_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(twl4030_dapm_widgets), - .dapm_routes = intercon, - .num_dapm_routes = ARRAY_SIZE(intercon), + .component_driver = { + .controls = twl4030_snd_controls, + .num_controls = ARRAY_SIZE(twl4030_snd_controls), + .dapm_widgets = twl4030_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(twl4030_dapm_widgets), + .dapm_routes = intercon, + .num_dapm_routes = ARRAY_SIZE(intercon), + }, }; static int twl4030_codec_probe(struct platform_device *pdev)