From patchwork Mon Aug 8 09:20:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267331 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 13ACD607D6 for ; Mon, 8 Aug 2016 09:21:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0399427D5D for ; Mon, 8 Aug 2016 09:21:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EC09227DCE; Mon, 8 Aug 2016 09:21:30 +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 66E9227D5D for ; Mon, 8 Aug 2016 09:21:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752635AbcHHJV3 (ORCPT ); Mon, 8 Aug 2016 05:21:29 -0400 Received: from relmlor1.renesas.com ([210.160.252.171]:11674 "EHLO relmlie4.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752398AbcHHJUK (ORCPT ); Mon, 8 Aug 2016 05:20:10 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie4.idc.renesas.com with ESMTP; 08 Aug 2016 18:20:08 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id C86E1522DD; Mon, 8 Aug 2016 18:20:08 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id B9453480A5; Mon, 8 Aug 2016 18:20:08 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id B8F77480A6; Mon, 8 Aug 2016 18:20:08 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id UAD13519; Mon, 8 Aug 2016 18:20:08 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="217447416" Received: from mail-pu1apc01lp0018.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.18]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:20:08 +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=/rf+fPIF1VRQEtYblBV+KOOk+JgU6BQ3r4+zUWsXMsA=; b=QeUg6MLYFCb0TyYVwf9F4k9xL1lDh4Z9rHrD4hexZjTp6NReVopTVJANuyV89pI2C68ptQdDzdbcchcgL5Px7t7BJrzOQNsnXVEziBKtQE05yZyU9gi+xwrtl6qqmwRu3Rh5oOOv+Azci6qvQZ/PWUY60LSGj6YN1QPjtXAWBk8= 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:20:05 +0000 Message-ID: <87popj39qp.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 105/159] ASoC: codec duplicated callback function goes to component on mc13783 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:20:05 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR06CA0033.apcprd06.prod.outlook.com (10.164.91.43) To PS1PR0601MB1449.apcprd06.prod.outlook.com (10.165.210.153) X-MS-Office365-Filtering-Correlation-Id: 000d0ed6-81e6-4a40-9948-08d3bf6d2f8f X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 2:ZSNvtIzG19EjiKoZUBx+5SpqmY5Q7gNadA25QfVchI2Ymo+Iz4dL5Xq6DZYCdkOJf4xgSRqx2xv2zWe65p5zHeCtI+6TWsjJO7x66CY/zfohIwBFbGLrwcw4qjJG+JIB8AE1FpbR1BJV/KFQuJVJFj0RIZ6e4d28YkhPzUO0RBb1gBIs7dR00wqw8YD3/3By; 3:DDsMbJHfHRR67safBnKoPbzuN09gvhqefRre5Zsv1OAa54PjX4R49OEhOc6np/b2Bq4bPxiolmXpNETAaky0Q7HC0JnsjwdXxPRG29zbpJi4AL9opOq7JPQYJq2JaCIv X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1449; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 25:UUVlCVOATSGq0pziMWclJ8t1zjtLyLYjHKMscyrorRzUBSdOgZ5Rve3AtGbLQNcLn75J84Wn3jWs1P+vOyuh24uTmqE+5rS+5CBnSOutlM2byfbfCDtf5knwMCpHMpBFjPi/MC5PIpkzXgQzJjNHPZdv1duUMTu7Dy+TVlUba/U+14tGknK37ZMu02FK47lGA+9nbU+UwYyA5tMT2lQyoc1ErSJ2fQON+NNe3r8EVH2XrXiTLDCCIa+VR4lp/8fjGWsC6bM0idmgEeeh9+l23yGlTlSrRWJesswKhYncA32i6nMn4Gzu6q3T+/rM9Y5jJ55L3XCG/lbkx9NQM9Vj7tL09aedrm1rn3KtBozFUlZo1togtw17Z6o892wx/URhz2M6MNMYBpHUNN9RXjoM1rXPUXnq9UH5Il2I/B7+9Ql/4OnO/tQio/pwDvz6FaRcdfG7ZtghuP7UFIFvellT9o+L2KyaiWJ3cxx5NuPJqf32pHrangcCBPCR+qvnADObgeK48/kl/AjI5YwRU5vjDzH/tY85h0cMGKQwxO4KTuDJaMvyqVRqTidKxHbUvvGekk8ymI2QIMfutoPaWtwhsEWF51mxtaZqrqe0Umc4Sog392CZRbWd7D4cFQcoZqWW4eL5I72Mrv7aC16R2OSbP1+nWglewehw+PHu/uK0/XU6kWfIUngkPx4Kbr6vWub8; 31:gdfI6njZwFhEfLXNY5RPwbb/ymmFsBOxHAaQL+Rq0wSH4w/pDcsobzWFF7HgO6YhXuZheSUaPBnghYt3D+msXbQddcsGr/Z0ULi00RkTH/P2Don4Q5/rtabycToYS4hM6LyyW5FxbucFSn1VBJpbvpR98tCfwoPNoSCVMyerBzu193kjch76txYPDJ0jp36Na0J+3dy9Z4qz0vRMr5nZJXOHykztaNTlGws Ar4cArcI= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 20:U5TCZH4UoaO/fUY7I0fedxzXNBSMcbsnmlZLG3ETBo1I1rpXOltjMKDpyvaGvKC71BorQqmljK0Zjw4GcFy7vvnCsMKwBctumC7llsBtmuzybIj7iZR9/xyIzVBvNHDZYK+j3K0XSN18n5NDC/VAi8xEux1CdIAZqvII6AmMAgOh5GKP4tdaDY3jjqZ+27RE7404RfXbBJfJUHwaT4zJx/QVvzOn0iifZAUeyO3vTo4M7b2DhE4UbFD5XTBVOAvmC+n6Ygccf3CdtQmLzvcSdAc7rYi7355gVl8P8RbutctjZljCMPRE1p0Eyf4kfErxorcjFNUE6X/Xob57QHapoDGqxASv+kB0XD5E0ubLz8BA9tmlyhy0wyGEnqodP9ND6e7zNgjbpA8i/cvLiUR6eppcXIZolnNUdPfFF/QlGhV8cJ5jceV+joHD+ZttuYqyIBXeZLD/6NvCOxDeL5FaejW9dm56pjbyPrI/S8ppwCmHy8XEPj1pvZaD6epp7g+t; 4:Mx1SmCy/ha+Gd9xCd7Wmm20mbuafydIsdos29OcL3rCiImnCOWAg+q1eo/0n3u0vvcFCQ4C4cduy+EMjgcMm/MH11yjFEFiqjtn6htq3Y0DsK8+gM7K2dSZJE0eJs6PRZq65M0kD25N59NCIh6xR8mK7n3SZtMM3KnidMQrMSwx6bwtdhEn/qw5GR20g52UA42EXCjWgTkW92huAIqlehZdKBT/l4L/fHhTOecaCt50hrPX4vusr4uaQvS1J69PLhugiVyzX6ZSyZA5iDXAVhPawIIu+UtRiBj3mdVdOFRVKxWWzHECqFOm+ZoyNS5MWaeE6fwlWaCCdG35Mhgi1Q8QcxI7p54352jeH+Wg7iD5Ft4KzQ4yA3g9ZEchoDsDc 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-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:endcX3H7fz67xiQNa+TmYnE0RICfqjKN3v1Y7Cg?= =?us-ascii?Q?EMVpKbTiuDIvqLUl1YTksOqA0sMZSTOK0yHYY4PTd6uXp/G9d+CPwKWinAf7?= =?us-ascii?Q?iJ3RDEqUlF5hA932Ycetghwh1xhUr6b9/PdMbHfdsLd1XtmJWitqduBQV9pg?= =?us-ascii?Q?AxeMmCcSTqeC4dDZybZR+SgpWw0XNl8Fap9ivlaxGTCMvkZfVE9ZT7koRuY3?= =?us-ascii?Q?2vu0P4xbpXD0MkrS+oxHOD2xGsm7Oaw1t3nEvLVTqDkGCJKaYp0ZSMqkFIXn?= =?us-ascii?Q?ESBDecTB8BXi3kWo0b7ppLiUjq6/ccLKpSDfHZMqm4vHq3oXdRdIj3us6g2G?= =?us-ascii?Q?fTgoFR0kK7VthvdNdGbAco9SMnmUE7U4bzJ5zJm4Bf7xRGLusEeoDfEG7PaC?= =?us-ascii?Q?N4g6j8IvENUQTg8XnaeISp+PLsq/ZWvFR/GF9ae/p0FbtGp9DvVFXrCUlZCx?= =?us-ascii?Q?NInZpUO3VhgSXsxZPGZCiDYBzYcXEFKntQjBp9YhgvtT+ClW6z0B5oTWC7u8?= =?us-ascii?Q?lXBERyXI3WN5e6yXyCnQr8tynye+SMrmir9GtUgnz1P8tFrO7e47ofaHRcow?= =?us-ascii?Q?oIwLh4oJNmTfEtO5Vtq5TN07KZPRcPWCJefdeFjgpg/AENdjZa/OquNKU8dF?= =?us-ascii?Q?NHCh890cBWcGpsCU7Zvn9fZLZR/v3QzPZD7P3By6Qfe2dJPqVFo7Gf6rsAiQ?= =?us-ascii?Q?eKX4/+FIhu2GMm73IDN7Z8Wmc79ZBWuank86rxGAJT2zLlV5tYuV6ToqWSLR?= =?us-ascii?Q?R09xLNIawySnjrxY/EsiD5tbe/B9KQEhX/FGp00UT12AE0PynW+Nvl1Xxoa0?= =?us-ascii?Q?eTnGb6KUbWBrOJqIVyACpyUBHpc6WBbS/jtkapzxwkwA5B9jG8Z6wllvEnCz?= =?us-ascii?Q?KyxCnFmL33eH0lamOqIRy0UDs0ZeBd+lrYsknCeWqg9etKS7Lu8xFPS8DmPf?= =?us-ascii?Q?f44jdqP1gDe07RflN2+//X7Xb/cpqpmoriHPqzLBC0JPrMuIVeXWn/PQ5znr?= =?us-ascii?Q?2OR7ehqOgjuc53ttT51C0W2yFitgdhSHqyjDjDH1OQymBjEW/EMDbw1lCrJo?= =?us-ascii?Q?+Fufs2SqVhkG14GgFZm0UPOhJKbp013Jfky4BcJixGx9RpONmuAdf8DbKOim?= =?us-ascii?Q?oICD1CfqSCqvOq9zwmXufk/IKL9EI3Shl/QuLleOKbVoUIyrmBteR5g=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 6:J3E5Dy90y32sPp6vudi3RkKoTLdsCDFvEI1vjBbHrqopj3EbaKmb/Ipu8Z5YjozU/OrYhLcudTTyS0/tBCacomNnCln13xmCTOZVnB/RhIzJk1Gz0RrS1S+2DKpfrLQebujoxtcOsewv4bI04eKe4B6mLkVVdmFc+EwxlXO2dwq8gU7cKOxoUcpw0f/PTCnanfTyQcd7ptErHpHKw/k5kgElQQehNYXiGwVRz+CHnkdJ5fXZShkv4qlmFxfkdc5vNIrecgCz+bxf19UCi9IPfcYDjMgoKfC+igVdOtMSfBuHjsmgqXUNOCHomjmvmNwbuYGc2xYJbooJpXdGBE4NEA==; 5:VkCTELFVNjTY9FYqKxvI1PeJR7kJMCbmvdxZa3tRNymnQ4n7pYZsXkoOcryEsolDMYLxYZjAGpATn7WeIVbu1N/l3JAVA2sbOPXfWJInc3pqQHxCqzfB51ZjOvTpc/JbYL8MnXj7Xy2ILW9oaof22A==; 24:z1n7UtHSgQijicftWwkOYQogJDyVy0NoJR43m9kFUNTYtj2Vh5nBDZJoXk2Mtu/g54ePq7umbZs1zq5xUanciEJAlqhJy8P+pRq4obedkKE=; 7:h+UUh15eePUm0cqf7L24qEg60ml+oBMlBqvYtP8upPk4ltj7RTElRafBsOy9GA540X7DPXSy20izEHFxKigfQPxpBz0YOFO8MF8joOLosgSKRT5eDxJ4TjXuf17GJMcPy6LbdzCH+kpNZrMx7j8TQYAtSTF74Ss2wW+NTvMcWy+0H2xu8OOlXmJcAx66KuIG+ApVdvG8c3BSmkvG3+97p2vUM0VcR06yvcrz8c0yeK/AFJBETS3ctmlvRiEMMESF SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1449; 20:YfFAfq4uLABtUtbXp1H4n1oWy5N/VJxUoKx4ymtcwK1SPeynyPpy02eh4P3ixQIp+H7Qh2d1EYGsSU1DSbsVegN8BbJmDiwf0ERyqAXEIFJPwwisKdqxaVl5zVOQQgOZWRV4pqNbwCe1ZA8nYDptMxK7dWLUR/yftSzPalFzTrc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:20:05.6009 (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/mc13783.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/mc13783.c b/sound/soc/codecs/mc13783.c index 3e770cb..9056270 100644 --- a/sound/soc/codecs/mc13783.c +++ b/sound/soc/codecs/mc13783.c @@ -737,12 +737,14 @@ static struct snd_soc_codec_driver soc_codec_dev_mc13783 = { .probe = mc13783_probe, .remove = mc13783_remove, .get_regmap = mc13783_get_regmap, - .controls = mc13783_control_list, - .num_controls = ARRAY_SIZE(mc13783_control_list), - .dapm_widgets = mc13783_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(mc13783_dapm_widgets), - .dapm_routes = mc13783_routes, - .num_dapm_routes = ARRAY_SIZE(mc13783_routes), + .component_driver = { + .controls = mc13783_control_list, + .num_controls = ARRAY_SIZE(mc13783_control_list), + .dapm_widgets = mc13783_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(mc13783_dapm_widgets), + .dapm_routes = mc13783_routes, + .num_dapm_routes = ARRAY_SIZE(mc13783_routes), + }, }; static int __init mc13783_codec_probe(struct platform_device *pdev)