From patchwork Mon Aug 8 09:13:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9267235 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 975E760754 for ; Mon, 8 Aug 2016 09:13:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 861EF26242 for ; Mon, 8 Aug 2016 09:13:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7A0DC271BC; Mon, 8 Aug 2016 09:13:50 +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 0BEC226242 for ; Mon, 8 Aug 2016 09:13:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751670AbcHHJNt (ORCPT ); Mon, 8 Aug 2016 05:13:49 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:58925 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751985AbcHHJNs (ORCPT ); Mon, 8 Aug 2016 05:13:48 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie2.idc.renesas.com with ESMTP; 08 Aug 2016 18:13:47 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 8066E592E6; Mon, 8 Aug 2016 18:13:47 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 6F8812806E; Mon, 8 Aug 2016 18:13:47 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 3EB2C2806D; Mon, 8 Aug 2016 18:13:47 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id UAA13197; Mon, 8 Aug 2016 18:13:47 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="217446903" Received: from mail-pu1apc01lp0015.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.15]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 08 Aug 2016 18:13:46 +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=LslDJAHDRrBChtHnDphge+83Pwtep+RCpnVkDo7uQyc=; b=Bs5+HOYxC7cDkYsi8s+xSQ+47uDnY6gbTevdChjJQdM7g0cTUe95mplmf92ioNGX8HTwSD9R0F7eybec49vQtuMsy7tXmVN0ijJzseiURDVDhUPx9twYFV23/AVlLLX+VqqD9t2WQzp3ZeI4V8rzwp05TviS3aq3IWSixyPm+7g= 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:13:44 +0000 Message-ID: <87k2fr4olr.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 084/159] ASoC: codec duplicated callback function goes to component on alc5632 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:13:44 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0029.jpnprd01.prod.outlook.com (10.164.162.139) To HK2PR0601MB1441.apcprd06.prod.outlook.com (10.165.182.147) X-MS-Office365-Filtering-Correlation-Id: 3f45cf91-a895-4195-1cf0-08d3bf6c4c29 X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 2:UTiFzm6F6yUYgxjyfl/cCILCcxrsD2eMCUABmfMsVc5TdEOijy8mWkOr8P3E7PVp5LhlFufmWReyDdaWat8f8yIK+G501RNbR2HMeTvNpqjgn/HctSwdEWYaK0xwTyJ+zvksOw/hl+gFTMfQmwV1//gzzNYgJ+vK2OoST9Y7uLM/AHGJYuXbx4NbEFe/HeIA; 3:Z/ePDN5aeGT/SuAYj0SfT8yqsCtu9rOez81fkcmiYYCkPUu+N70KxFHRN+MR7LnMTdOGYrgG1lm1knEgYJEwd0RYAqc0a7+shxfsDSWKeRKWxCNzYGAUrlsMQOP6NxhX X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1441; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 25:g5sm/o1GYbnIKTm0nVAwQg4yO1Khb+iCNTSYwJVAi9KmxczjfY6CQMbki8mrNXc3gU9aEVSTSsuNiiK7o814AWw/GKjb7C/uoPFptGCMh7NlfCzzlig+9mspuvNwX8gw6ElRn3ilJ0zvt0GiByO+Hsnh53yYcgexo2EtBlXszSzT+ol2Qd75gfKXqW4lQ4OHtNF0ry7tNPSUO0dMjyIKJBvPnT9ZKzWMTQ/kqQMXtzTxRhcOm3VcYMZe2G4I/PeIuNxayP4h+8HqAI9tIKhIyVtDhF8fqHyehAGOababWnNb1vyuSuA8Rjd5B1WL1FNkTaBBulUpJjPXXaPUw2iikADLqQ1ZlF3s+R60okMd5fibY5bOT2dKV/YGqGqebJXZWFjRsW5CUzi8PQqE+tqmLFA/qSfZtlmgQ6WZ6quZAd4fQDesau14UMoPdLGVLmJPP1JUT71t2jYHMmGVc9A77/qq6Yx6+P5cby5w+o5vusJnLkUuxHOv7opT3HWPxUl9D7Kml8u4Dq5qwlV9s/PRT0amI14FYYIuuFzaXbvgoU93vfx3DFsiNs2Y7wM96Zqdl0U1wXTr/4DdGd7EaChn76gYKw2plaZ52qBUFg+HV0jKhSW8UwdKzca31OhOk00omKBo9dBoeVK+fdxq22IhNYwdsUqZCrOc8TT2lDmdnXYHI+9mfFlp0v3/87xNL8c3tSoP/VZw+V80HV3W4wAUKQ==; 31:Z6Xaqi6mcq7jSeENhbh3QVGHQ74nQ69BmECV5uPG9tP5i/kf9lVdBZubnNQz7Ds+QJk709d3TNPVlFYLSpn+S6TE3tzpdd5GrmUDSGJRPg5r/I7UZukJmD2cnVmm/W3U98+tBZuZsbmRTUwFoYMPM1kpDf5dwBtT8/l/Lyl2u3D4IAAfvGHRGdrnbQ34catqBukTmfLD+N2 X0dg9ohKQq5YkM0WVWW/BPrO7lYMqRRY= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 20:EiDKUrxooLS9oT93GTWjm133q4FxGvbJpcmsqiJDkFmqYVOrEU6MzyITKov8QBvYzWYetPcIvT5VflUe9AlO3/yUgoGLDqX4sL6kpY2+owZT69F99V1gKdIiY05yI5039Y6IMVkjcXAoJo0i8jChEkoEtAkcFSkgo26HiBw5Csvx0jylguzg+bt6hh9oPAmFAiDsKWlIapog8NbnUdUqIszvHo1bMqnrVvD1YMBgaHsGDyctNYUCDqMHWygT03zRdBkKR5ui4lrp/dVU9xeydnuTIGFGXs5npuFkDsJ00BNk9N7hsj2uM6jCAcPrJrhnEq/jlVbo5otdLybWB441CjTm3ZuZKa+5G4gBqCgWSVWm6/dYXkQ+CCLBy8ygobvRp0zyZHPliEZ2/HLDdUpZTLk7N4Y8KN3aq5tliqG4uyNL4bt8BHyJkBW7e8LEAqQNzMhcDuTayyfS9/33jcsjUzsl3PYONNDZIasV6vzKNdjoEkPpOYl9VhLFJmsDW/hX; 4:8cpZM4mw5FHiMN+6uEWIb6t/IaA7I9qYazh+42Mm6r3tVhHaB0d5BrA61Mgl8uIyqTEQIhQB1kUFHKWGnppM2pt6OF4BGVQImeUPAAUEDQC9HfDOakJY6KsYtcA40KbP1iViqEH+EgQJDRK0gfxRb1vN7HV2MOdQytsDTsDOkHoiJ1pqAN2dtUcFUPVQJm7qzKWgPr/U/GZtNL/36/8UBKZDI9LWHdRLyef6pXi8OOD8wuOk8at6LIRj18AnXkqY6pnIiZO1tKBzzhxO1mINiDfJ4cyoosvmcV78hY3tegandgGgAUpeqZwLlASAC/NocKRyYf9zwRi+QhGmOSp0hgcs5c4HbzJJOdhRuRo2vUzq9mp8d22QS8ENeD75EAGft1BxMzXwND9kAbQpiFzltw== 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)(199003)(189002)(68736007)(2906002)(46406003)(4326007)(33646002)(586003)(92566002)(86362001)(23726003)(36756003)(6116002)(101416001)(3846002)(7846002)(305945005)(97736004)(53416004)(110136002)(229853001)(4001350100001)(76176999)(105586002)(189998001)(54356999)(50986999)(42186005)(50466002)(19580395003)(47776003)(81156014)(19580405001)(69596002)(2950100001)(106356001)(83506001)(8676002)(66066001)(81166006)(77096005)(7736002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1441; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1441; 23:qqE1Gw9ewpEzt+gRRSGhy7D+97tbPO/AprQ5HZn?= =?us-ascii?Q?xn8lqdU64j21QWKNFR46MLgeCe9fEH0ZFoiURvA+9JXGbLgwbWZcEgUdPk0H?= =?us-ascii?Q?1nxa9QE11Wt4jTwYxpAlRj8R0TyWsCbIrPBnmqinfzHmOhhtY8XKiigDkd1O?= =?us-ascii?Q?x39/n/ADookQ05dpATfJPbgiLGlx5SSF7JhE04MsPnl7eFepTBoHcKyhvfl9?= =?us-ascii?Q?BVzoxMIrZWwU5FO4O+ZhCWqA0pJCSTfbAdcV0mGmaJoPJkNs+SFGaKVj7uKx?= =?us-ascii?Q?3KHxE45ux1q4sBsPJYmWYqAzVzTJWOtAOvZLtK6M90DjLWjGCnIMpeI420lq?= =?us-ascii?Q?vQn71EaTimF9seivgUfmmWJmwtd38XE+CplEUKAgHPdduvt2tHgQxpTqcLEG?= =?us-ascii?Q?gEhXrJTaysDZxPsaOCamazrJCtjykWlWhPAEqZ1lbutEN+3wBBmePee4LcjF?= =?us-ascii?Q?+mrUp4kaZfRGhHnPoYzbZvLFsaoIQkTOndHsQV2ICDcRh3Xr50OIMgUYvCJ/?= =?us-ascii?Q?DdjgSy1pAHWENL+3pZe9wVEWNDunnhu/qM1oQB11UjUriDPcukPrQMAU6P3E?= =?us-ascii?Q?ixk95JHMfbit0oj4qMnsSuO+F7y90GEUR5rJXqFy2KnggiyhH525rVpv16Oy?= =?us-ascii?Q?94z1EcR0BtYcShObIjsbrpWDll40rmMwQFoEz5O0VQfcNIOxXuyoFIDp75nZ?= =?us-ascii?Q?RYFIiJY/NF2oy7Hxm5B+4sMu77BeZ2TkFLElhZV/RIIx6CiztWSu12Wsu7Hs?= =?us-ascii?Q?muSPwBhn6wZXZcdaq7AJRUwPN15xKuslz0EJWtseY7EpQEl1IGbo7aQhVLkp?= =?us-ascii?Q?abKVERA7wqDAZ3etBcJW2mj32HRae+ZBpTM6yt/T/gfXgXa+oNR2ib3Sopwh?= =?us-ascii?Q?wqqO6UcoN2duKzQEutYUQswQaTwppGC6XZnMXwo+saHVbd1ShFv3B04hv9Rp?= =?us-ascii?Q?YvBVuW/C7kUoAtcEIOs3EjklKMhxVlA7dX8yQCHrOEQfF8cAtKtXI4UsN5uh?= =?us-ascii?Q?zlmP6Z3uoxz5W5LtPb6DrVs9mOv2XSJXDhOTw+yQvqaT7cuvifZYUBryW2+X?= =?us-ascii?Q?GKi569lfJyNSPJ3tKgaxKMHMybqBrxNAIjTDmAWty2LbDI+lwcGxfezUsQyf?= =?us-ascii?Q?ALQKdN6Dcun4xCUxTLG5ZbBWT4ps7mvCGo2QfUZjC9DhTfnXjoQbHDw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 6:8ozVwfuHonA6sWwLk2HTh4WnaFTIeuAfgk5T3HPEUOMiXD6ZeJ4yumqz82MulWd1HYn66a+dOAgFIJMSVZ23idoyCh2/dnryZr4SnvRhYtHpeE/RH37hagVFoFwChjonnhZRelql4PfAkPvPKOYEjXg/10aVNOhS0O4mG37IyGFznixMFpyeCMj8zgQwpENoO42qlHkIJrQaf270rY5EQ8b9AmY6BYSIrtGWRwihHphh3AC150iWQBmAsU3B7W3NYPLTY2ImnGtTldpNhaMXWOT8KLNVrxLPcC0yWxiEUSfcczXMXA8Xi/L9FDi6uPPjD5e7kb12oHicBzK8TgbWNw==; 5:QzxuO7KK1VX/NIdJXCRkCPUKzRPh6JbyLVPEtV2fgbaH2qUprX8mw7Auy+1OxhGdyxygKCpx7zt/UOkPxeudTJ+XkZnT4OREyU7/FhnmSsufWO26udtfLg34wZ8Agz7VeMZyZH7xNIXfdcaxljvRDw==; 24:2HamSg06PSzk+K7oYbENqO/gBV+n1Rll6APnQM7xMfpipU56NdNwqclYe8Hk4tLyMMOhjhNb/ccgPowJ3d+o71i6VcrFckGDlT1AwFoAYpU=; 7:z8UCDR/zjcAbKjUOyO4oj1NqnF1Kta9nqHaWwUBE72nEeNpOV7i2Z+QDVUITRX7v6RTDo6tFk6o+cnEGz3i5J+4mQ+gqAIRkHSadn3ypAOagBUWZEZ8+jYMgfzVp+ObLAKMUEP1hGcE3kNtUQKXtpGib6cVge2+e6vM3+HhVXAr9srH08RVDoVCo21mCrwAT2fwckNyd6O5SEvO79ZQR63ohlGqe4uHRus8ri8STcuriuMVgQTMCcpRODVj84WET SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 20:aUuVgkADUHSMX7Xkn7v/nITZZoxoXhDi2/eyTdPs1VyJx8ruLjvDPTO1Klzt9y4zEobmzhoNfuzY/6blOcUcZd4l/b+9tZMg0Y2TMcnAnMPAmaC5rKMHZS3tsrRVURjVhAb7X8W+FRfzkde3kPWWHg7O4JunXSgfLXhHqa08xw8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2016 09:13:44.0054 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1441 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/alc5632.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/alc5632.c b/sound/soc/codecs/alc5632.c index 4d3ba33..adb80d8 100644 --- a/sound/soc/codecs/alc5632.c +++ b/sound/soc/codecs/alc5632.c @@ -1072,12 +1072,14 @@ static const struct snd_soc_codec_driver soc_codec_device_alc5632 = { .set_bias_level = alc5632_set_bias_level, .suspend_bias_off = true, - .controls = alc5632_snd_controls, - .num_controls = ARRAY_SIZE(alc5632_snd_controls), - .dapm_widgets = alc5632_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(alc5632_dapm_widgets), - .dapm_routes = alc5632_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(alc5632_dapm_routes), + .component_driver = { + .controls = alc5632_snd_controls, + .num_controls = ARRAY_SIZE(alc5632_snd_controls), + .dapm_widgets = alc5632_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(alc5632_dapm_widgets), + .dapm_routes = alc5632_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(alc5632_dapm_routes), + }, }; static const struct regmap_config alc5632_regmap = {