From patchwork Mon Aug 8 09:35:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9268237 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 3754D607D6 for ; Mon, 8 Aug 2016 12:24:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CFD72808C for ; Mon, 8 Aug 2016 12:24:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0C9C928387; Mon, 8 Aug 2016 12:24:15 +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 2A3AD2808C for ; Mon, 8 Aug 2016 12:24:14 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 50F98269686; Mon, 8 Aug 2016 14:24:12 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 7443C267C28; Mon, 8 Aug 2016 12:14:47 +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 98E6C267C53; Mon, 8 Aug 2016 12:14:45 +0200 (CEST) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id E97B726702D for ; Mon, 8 Aug 2016 11:35: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:35:38 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 9830559EEA; Mon, 8 Aug 2016 18:35:38 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 6CD5B2806E; Mon, 8 Aug 2016 18:35:38 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 4E58D2806D; Mon, 8 Aug 2016 18:35:38 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id UAK22343; Mon, 8 Aug 2016 18:35:38 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="216938672" Received: from mail-pu1apc01lp0023.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.23]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:35: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=BXR2KX1BNSvV587k9fG++pwBXSuDgbvAuZ21a2f4es8=; b=LjoaNp3z5FZMNqadNT4SuHvku4P/RZHoSzyyEwW7G86CQ+rrq5yyjzJZDUzKKYheVtVrK1hNbdqDnhxdbYUBlIMsVTb6IgVgJRbT30nU+j6Xx0eFZbCc0bF0oAq4AxFEB+Ujuzt4R1+C1xLDSUnEtdtCT6mAvgTTSRfeIb2OVI4= 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 HK2PR0601MB1441.apcprd06.prod.outlook.com (10.165.182.147) 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:35:34 +0000 Message-ID: <87oa53zk34.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:35:34 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0029.jpnprd01.prod.outlook.com (10.164.161.139) To HK2PR0601MB1441.apcprd06.prod.outlook.com (10.165.182.147) X-MS-Office365-Filtering-Correlation-Id: 7851b896-3eed-4bc9-89ba-08d3bf6f5989 X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 2:5cucg1nayR18L786OAK83rigLqOg8NM+Mlw4KSORuJMuaJZxGqKx3K2six2h3fTyIKpThgCRg3ggr1VDHeCw6sa6eOV20mqfnWQDsXN2m2yxKeAfNc5nyQXKSbYxn2sABEjj3yXnTx9YyzOTiC/LpD27x5riairgC3AXSxBqdeSyDtc4Tfy0YbUWo+IT1CUu; 3:3QCg6Vx0kstRBNbA1mYGxVcDbf3TI/rw5J9VnACJZJq0MKnqfxfRoFXqWVh72BQKBm9pvFLIJzVOYvbzAo7OLn8FirT5XoR/Ex5RxUX2StRJ9ZW2Nxk9FGvea7rqBRvA X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1441; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 25:BDmos+YGCy2WdFtsKYtZ/N3JGbA5vfwtmSt4c6z11rnQCgfUsRddY8Yyb4AA/x32hv5CyMit7jlwfxEsAA5CK5TM3j/yFnuQgdgf3ofjs3YeoOJ49I7jmMWnrkQ68ak1aO2rdG18y8OQbwxFsb3Jkmp/O9RzRpuICLyQKfFNgYepncKfi++y9UXgwelP1mV8sjJYW48BCtp6MGPZSckoRz+fTYZ5jlVRrrCzmgEeytGZER6th/2MCK64sWF3EOJl3EYamiHNbnsdJ7uzEdekI4c4qQA1tZv7LkTRzrDcfkvKHwaJTbs4qVXPud3XlcoGjLmb8vy6qevHknLRDj6JZyA9IMKBuSDIgAKRBqiFOwH01yUBmUfaF/ATB8KfbSI0A5pQhl12g9rKi26BQ4U25rVq/pN4MX+kTv0qZFbrcbme2xQmBbRoNO7C57ds+RgAtJiUI+bsInUp3/JdEfNXDMH/Dg0C4KH1WiszzX2LB06iJ1eBr4xwscKv7u8A77uwsKXvMMPMmX9dg5Th0FkgZDLqa3j1bhP9PBzJKZ/jntDIkBKReBczji8ZeeztsI/CtEfjRkqDgyYvRIzGfzK4Xli8Vn1sSP1mZdPHDACLSBa7+Y3pvmW2pVsqB4/nDij5Ishin7BcITkaNg9tnQa6mj80EwqW5kxuokWo5A0EMK9IvlWRHj1UWdEzddeC1uo0/o7PPG/Whyr37bI1Z70i+g==; 31:ISu9dQdW9rOX0b7/nqQRHupi7+Hf27d7UbGuYCeIhOMnbWtJmRqZiAJDwqkDYC5vbGkTskWAw/s8ynYqKAP98m7KIe9vBJJiOAnwnfvWMg75zrjymp18PfBo24kQU4M3CofrKCBEK1GHjxFxm0Cvij5ydeMIlBMgHDP/bRU9hI+G19JE8GSkEUfXwdAxgDD8yxvi+lGmqc+wKVwDSHwMgJ6Iw4ltzdcBbboJb7Vcp1c= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 20:zQ4s+GM90mVUQtq619S43x3nVCKCi6O1RjbVJSx2S7UmpYEuiMuvy2ewK/QYSCBpAKDuWJSBnStto19mVPFGRVIdZTJv/r93eueEm1MaOfhgNtKauyPC7aaVX0MUKMUNG/3fQCPC2BBS9MILd2mX8W6Y8KdvZcCGL109m37T4mTcRuCwG0oN3AbJiLdL4nwY4Pm3e5319uz8vPxmOEUrQG239gCC8lrlQnw5UkCYT4X4GVuZBGdK7exOQEIkvhdmstfZ2GCgP6Qq4ikV6YT5KD4iDuAnL/UwqTIO+kP5NWDvyU6xsFi4izuQuwpbFoPkCuHVpEIHRfC4YWVn4i1ZKA+n/3WoIQXzgac1N0NVf3HvFvYGgIZX/N8M/OUzmhEYYNtk53udXlBOKkYWR2iIVKvIrbvjWwLQCIYZ1+4GD3w0q1LnfSAITP1OYKWmTcKMtNiqv8SExjRKCxITtq9ovRcW3RTHt+2lIvYkYMuwpZoESP3sbReH9eF7EDHhJVPr; 4:jI5EJdD3iipdc1JyHpYhdKpfOjK+3ZhKlyq4vEwX6ulfuwtzaUI9P0kF4VL1ma22VNhqiU2GMjtn7Rew7NApaBF4pmI5VbtoXvSTlYRdaqpfFw4xYYml/MogvmJwKqTis6cL2BC1Tgx0YLXe3thcnnnswke3avcoXoB1nBUo+cIu5dtIvecM833KH74882OOfOfBw1LDheBlxER7n6tSC8oQJmXZVQbmjRNtTumAtacpXpZKKzJ1Ca76cOJ5RyiSjdx6yb0Apeb1BCMWSWwCH3Dy+D7uDR8HP6pb2PJIP+dNEdzPT5/NXqnWjAJdDMIJVGlysDdjBYMM5GHgBnhdM9R78k4YtSgFB80Z09Gaewd5U806cNE0nDG9Eur6b/62S1oPdfbqESpmg/Sr1IB/Vw== 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:HK2PR0601MB1441; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1441; X-Forefront-PRVS: 00286C0CA6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(189998001)(54356999)(50986999)(105586002)(76176999)(50466002)(42186005)(7846002)(305945005)(4001350100001)(229853001)(97736004)(53416004)(110136002)(8676002)(83506001)(2950100001)(106356001)(77096005)(7736002)(66066001)(81166006)(19580405001)(81156014)(19580395003)(47776003)(69596002)(92566002)(586003)(86362001)(68736007)(2906002)(46406003)(33646002)(4326007)(101416001)(3846002)(36756003)(23726003)(6116002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1441; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1441; 23:m2VI1gjvgTtWdD6snno5aKLCTKbKclOEdjXp4rm?= =?us-ascii?Q?s8agjISdbCMkxdzfshrs4qql3Nr8Vt908NKfcpiYA9Dc3ogYhMaRVQVTBtSX?= =?us-ascii?Q?9dJ5E089LATJTYX7phqiZgiLuqisho4thVQIMR5AAcVfCA8AnQMb8/wwPkbX?= =?us-ascii?Q?VnzkOXyd9JuzuzCrrbC4YNrwvGcxOLFr6i2F61hzs8G101LT5cCPmOqgWRak?= =?us-ascii?Q?ftKDJLCNbpYiHgyJDe1lD1lR0JjnObbxMOQnKMjwNXY6eiKFqdGoxtEUyT1A?= =?us-ascii?Q?bDAXih+h+8ppGVt9mNVx0h8+kO/aq2V4QeFSkAv2Cpb8w3USEP9R3Fnqw8G8?= =?us-ascii?Q?XUOHleyH3gfTS8PTkH4LsTY4PnGxfpq2zeC2bKf4ReirlUmcRJIfTpEG/4oE?= =?us-ascii?Q?14jWGW+H7VuV+l54d7gvnIh6WNuF4l2GB/jc8bnu6HNSVOaYCZZnjrLaI7x5?= =?us-ascii?Q?O5HkxNzWN0iN5+7CSyKfKqQx1KF75FuRaMyxz9oY27Jw6hmoB1uPDFha3O5S?= =?us-ascii?Q?UF0y1lSORkhlxTtB2IdICEAxlagAXF8QErdK7YsmNt8W5w96syIJIINMoVTd?= =?us-ascii?Q?eBh0VcI9i3MmYF5MsfggPF0d3EZu+sOVAoNRwHrYjJF4iYpxCcdDR/L7Lzxb?= =?us-ascii?Q?fQ0MXccP1iH9odVhVjtD0cQdd/g5A8QDfJVIYJRhoNV5M28uFJ/dTsyEHrQR?= =?us-ascii?Q?uBGK7nTW29oHcVsvPZIxPzcxEM9Eu3+x5dTxrwbHAR0L2pH37oMW+uPLPQ3v?= =?us-ascii?Q?9gDp9oSy+arauUinOgJNAfEjEAX1fiq4+gCO/Vb0euY7TSOhRLQq8BWPC7BG?= =?us-ascii?Q?W9pXt7mNjc5pIuXAj8BgVjgdUrRa/O0rV3OSllRoedSRoBrAvR9uUAutUe1C?= =?us-ascii?Q?Dna7SzzXh9umSUv+XDgdx61S0vBUk1o6doG5as0jFU3K1nujwsIsmSarO1wD?= =?us-ascii?Q?bkwRQZzb+DKZkCS6S8mxIuJNEUFam7UdFkf3JmfRlfwt90zHMimz5VpfLA2p?= =?us-ascii?Q?1Va7pXKV6ydTLITEXZJ7n1/yoQy/8/Ch7wfKprBfBPu4Salf+2IeXAkDP5EO?= =?us-ascii?Q?4HI6LD1Tyh2fJ52qtKxjSvqH9PjboEprOQI2WdxEt3T5KRti8+Kk8fEXmDT2?= =?us-ascii?Q?wx5nrKklQBc7UMX06EcvtbkHvCc1Gi9gOMcDEgtVNbcVeBIuORTf/ZA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 6:Gp4OxWqTlNNrzZxA2jp5PdtL4ZaI6HB6M25wh0Wv2e+GM8njGXq6aLyeegsBPDeLKJoETp+J+SBSGMOkLXqIoogRDAQjbScGNDfVDIBcVuePmVM2JyfqkYklEddK0tDIHcgGVGZmZDIzTWqBrUSTRlYHaNZHT5B5aVIf6HyJkUSXe3plDUxiFJ8J++Yv7pu31tC2+XhhP48d6gy9a3Dn2NrgM9IvsMsHT9P0Ah94gheMjsyg4Hq/UIsBnNJWPTq92bcxiJTKFIo46+VABfwHOnwKbY69xkC+QbG7UexRBthZ8pSXaLbz51+HnRdyjrOGP77iqD95RPosx36PbTTg+w==; 5:qaHUn+MhpUxEwmxOpKU749HZXMoHpBUZOqX1J+fmXT4JpgLkgxRxVOeGS6401FjwpM0t/Dftc8kq57McpbOkA4SQLq+MGBdIJou7VfiyWhfRaGmVNBiu8SjkGnka8XwpfTDQAImjikb0SrDVfKD7bQ==; 24:Ik70vBjhlQm4HDaa/fQX+VjYDPoqvQcpEsOL6PsNypo8ChBBjrfX0olQyUvcwCJ6IVIGuSfl+Rs4673pC3uzYMu6C5urKirUJltCEEsSDUg=; 7:M9G8t5bpOyvA/6PYZrcKaAvioAxE/5a8tTAS/j312KqS4iau9oVHSIes8cZtBcFUnNM47FFTyKXL1BWZpFBCH9yZNPz94sqzrA4RTtjin7rtTfNaA7Bf6SijbiQZiq83TVXlCCibzgdTM1BLTsQw2xPzVrO6W2ctdOu8+YLxOJ8mc8+20mW4JkRna/aX/pUEmRvvdH3JpRZZdtDl0ookZNy7cvCEytGrkwGS0I0XYHboAnb8YFg32VcIMy/nLnIB SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 20:34j/DqEZBAXj5/MPZo/0w/trqXltPhF01mv8wRORzytgUDINtAFQupllcPWUIsNLF8ajK2x5yODPxCh7KeyLQApj8t7CnKh3amZc5w6xSMQU74IHjOXTZPlffoI1Iyn5gLbIJMDd02+ubB+7lAlap6UgJ++BBvCEP1fh4vz1bqE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:35:34.8288 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1441 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 156/159] ASoC: codec duplicated callback function goes to component on wm9705 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/wm9705.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm9705.c b/sound/soc/codecs/wm9705.c index 744842c..c88492d 100644 --- a/sound/soc/codecs/wm9705.c +++ b/sound/soc/codecs/wm9705.c @@ -364,12 +364,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9705 = { .reg_cache_step = 2, .reg_cache_default = wm9705_reg, - .controls = wm9705_snd_ac97_controls, - .num_controls = ARRAY_SIZE(wm9705_snd_ac97_controls), - .dapm_widgets = wm9705_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm9705_dapm_widgets), - .dapm_routes = wm9705_audio_map, - .num_dapm_routes = ARRAY_SIZE(wm9705_audio_map), + .component_driver = { + .controls = wm9705_snd_ac97_controls, + .num_controls = ARRAY_SIZE(wm9705_snd_ac97_controls), + .dapm_widgets = wm9705_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm9705_dapm_widgets), + .dapm_routes = wm9705_audio_map, + .num_dapm_routes = ARRAY_SIZE(wm9705_audio_map), + }, }; static int wm9705_probe(struct platform_device *pdev)