From patchwork Tue Aug 9 05:34:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9270343 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 BAB436082E for ; Tue, 9 Aug 2016 06:26:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8245283EE for ; Tue, 9 Aug 2016 06:26:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 98E652843E; Tue, 9 Aug 2016 06:26:12 +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 9657C283EE for ; Tue, 9 Aug 2016 06:26:11 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 791612677A5; Tue, 9 Aug 2016 08:26:10 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 01755267418; Tue, 9 Aug 2016 07:54:17 +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 D5C93267B0C; Tue, 9 Aug 2016 07:54:12 +0200 (CEST) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id CFA98266880 for ; Tue, 9 Aug 2016 07:34:08 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie1.idc.renesas.com with ESMTP; 09 Aug 2016 14:34:07 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 93FE7473AF; Tue, 9 Aug 2016 14:34:07 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 844BC1806F; Tue, 9 Aug 2016 14:34:07 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 7C7BA1800A; Tue, 9 Aug 2016 14:34:07 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id QAV22559; Tue, 9 Aug 2016 14:34:07 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217521958" Received: from mail-sg2apc01lp0241.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.241]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 09 Aug 2016 14:34:06 +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=QX4mW8FY9mfB9f/0e8EwbCvVlmtbRJUoHXdSpfknq4Y=; b=I/HzdEq2v1U1mJl6FwQFesb5DnYUokvps5duHrUyWusz2yg90ZXyje4EJwVn1DAE1t4Qsiaum5NMZQNJASpOQgaNYQ6Nz3Rg3VSXxASXqHAxQCILqn5J0UG+ZDn06BK7WaGaGv3RQvbsMS/4ZQGRJ2K43SyjbWMqV9RoW0XLnw8= 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; Tue, 9 Aug 2016 05:34:04 +0000 Message-ID: <87wpjq8qdo.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: <87popieek9.wl%kuninori.morimoto.gx@renesas.com> References: <87popieek9.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 9 Aug 2016 05:34:04 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OSXPR01CA0040.jpnprd01.prod.outlook.com (10.167.143.158) To HK2PR0601MB1441.apcprd06.prod.outlook.com (10.165.182.147) X-MS-Office365-Filtering-Correlation-Id: 467c26cf-50ae-4759-23eb-08d3c016c6b8 X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 2:VYR1z/wUq0TgE8Yr1xPh0J8E4xf5bHigNY82HxqJK4WX8j7oaNsHoqL1iID9Klo0dwawC38KtK/VadVwjCP3mEftuSu4CylCOcIBidt4/lybKmiFoDQdgsxH+yan34pQfxUjjuXgr0+oHHYx/mbOtE2SPNPrmmjj2gHFZmcVy7F0+BXxBIvxRgqKygEOTJit; 3:5S8bk2GiiiJR+Mo/uKZmTYgVtEaye4zzToc6bOI7qhKVsOOjsDhvdhi1Ka7oMoZne65DA4/QtX6jxAxwR2ClvrxKkfTTYf+z+B9XzdysFnFsnzN42G/H2C7pvcvPd9Wn; 25:MbWi4lWa9RwDU0mwtFyFdyWMMvZ38sHufTgcj0VItVWDVTYZZqlOWT+3lOsATFWKIhidEMpHDKGcdvvB6/kUArS/YdyT+tp0OFaUo2XEnifnOxq/lhMzl3YPwbEjQVew0Ltn8WEdzrk66SsdGyPTzwa2Fg9war40gxR5ScZ/XY8SegkbklqsmCqaUYUJ+WwVP3o9D2UyJJ/IFVCp0zxKMhhKx0GA2KIFlO9E2iNLNUJiOGUbS6fEt4j4vCmDOFkp+jxGOeey4vzjjHsFH54S1Sa3rfvNij0R4VkU5aGQCgMcSRgFen5dawZBmHvoGnE+C4es10iww6M5kn4k1Pf8iWaAKnGScFe1XP3OsdEqVIusRxJeigciXulYdPJAWEp8DUk0NEBENSIa7NNlVTmtHF1OzypBTr1LvgP54Zsyths= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1441; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 31:FLcDdKAAgjeKf3Mju6f3itoxjrU4Bp07WDm1dk3ZNOraC9+cnXd6CrTBpPZZdZe7HCRarSEUsp9LE0aHngyhufnwlMqIIVLek0EBHpJX9Wc4HHLEeA4gSYyNgkizmPDBIBnaQxmpztFspL1zDGa7GvIpbAAxixn1tTr2saBdU9nJanOKUKWA/TqNCErTHb0UDe6jkQdhllEHvnhpCN7QLmUs8pSpI2FlWYu4Tx8pzGM=; 20:RhxhC2ONmiDqZhcN8Ww56ER+vd2uIWIqtcj4f8yXIeYYK5VoMbM34rzMmlOiCC1ju2hx32LcDInjqpk8FowzbS3iIiInFCttpib4UZqoi2OrsHC3djsG+SBThPy6DCShZplBxcnKs7AgAb0KJvWeiGZRJY5z5l22ZiWCu6NqlxRBFkDG3wLZpRpV+xIhRv3sUWX/vSReJh6dEglUoayufKD2Uz/F40TdAeL4sJQFtZ5p1vZwwfCBp9V4ozquNStEFMlQAxhKCRsOdSjnUKZXFzgNgvt8CxdQaZ3J8qWlMePfaxNt9B1qeufZCDpxFQvD/1iRbtOOAFUJX8rnyYC+D+OnbVxxkqnsYjW43siqbY6PUwa3bnAglUbm5SIMl8DwCGp4T1FTjFf1eSVWZZG5DkBK+J6osRUVyqL9DLDcjGO6Z/ZakGbHzLhn8F/XIMFwLhUywuz98DCgUbZzvlouU4C5HTBO/QkOM7SuRGXmFSQ2URGR5ES3KeRZo3Yq5XYI 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:HK2PR0601MB1441; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1441; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 4:WP/EA/ef6/uBYZwIU9bDwrCU2/0nw/AOH/EPKdhk+M6LG8Gkd58JonuoV2dxZ9LQzTF4d/rQ6a6Qz1JQPh529nCf9pPh7hSnC9uFMt4SH0oEDfuzPSr1Mb4M8PTFWIVhxYObKm/3EPZ2HcZo6c4MMEmWR3hignDnJAOERD9BH3IQyvPcJYWtPXFr5y+Tk6PkFaP67Yp6pVkqoTYiVu3Pf5fZOAH+id0S5ORW5sjS1NN0cBXKbDU3YCs2qMQf7VxUKrnPQ9l1RVnK6YTm+SjPMmxeHgpSjP0FByOSHXiEkrFXhJCQqdi2T6aDbH7NoNtHFsDPcAhYtOiIV/htg1QPTrvu+ebTxfJPmqSm1JDQyR55M+636/+BQabe/Tl+4cJvG2PU67n/qx43BOtpeYWVjQ== X-Forefront-PRVS: 0029F17A3F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(36756003)(76176999)(19580405001)(19580395003)(50986999)(54356999)(69596002)(86362001)(2950100001)(50466002)(106356001)(47776003)(46406003)(81156014)(229853001)(8676002)(33646002)(101416001)(81166006)(66066001)(110136002)(4326007)(92566002)(77096005)(68736007)(23726003)(83506001)(42186005)(4001350100001)(7846002)(7736002)(305945005)(189998001)(97736004)(53416004)(105586002)(3846002)(6116002)(2906002)(586003)(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:81WuEwmBIXuNjysEIAy+QrjugpuHxaepVCcgK84?= =?us-ascii?Q?FYKlHJgFI2ogRoKHtZD1PedEfeX1BC7Lxn1veTp4f7rPMthcAODuFkC9/ChH?= =?us-ascii?Q?uo2nJXkZDlBmQb3upCq2SyBxZrHMovrk7wpVQQpquyz/LdZZQoFPl2qW3Uts?= =?us-ascii?Q?VdwlQZkfOZ2teisWCbrDZtitp01BZ/hUiSHp+B9qqphqPXUuIeeooFVi7jjN?= =?us-ascii?Q?dWFkxS4g7yhypYd1+xTWUMaRONOg4Pp9dYb/T8acuiELHzgsC9dxNoP7tQUj?= =?us-ascii?Q?J8qMG1EGTIiE6SkCnZEZIF+4ucPeCTEmiRA3WBy/m20lJppLM3/ZAOijgr5w?= =?us-ascii?Q?kAArLqaF8m7rfi+qp3pTf/h7nhQGsOUrKhVZiyJ7lnTthBExtpafMzXY4GIM?= =?us-ascii?Q?9WoHGoSmmqP3ur2mwPooidKwRrrxHMRvyH8z+SvEB4TLrjMNgloYon901sFv?= =?us-ascii?Q?pdVi68MvO/9wMapRV6R9AkF8mVXZIG/odjs3cZN0b9LJVYtWFVgQXFA7rwZ6?= =?us-ascii?Q?2qak6mu1RkCek0yCw4GEIoXuYplIUxSrafmXfpumitJ0kR6VdANVq5R0yHbs?= =?us-ascii?Q?8xNnnuN//q/FBF2aBQJwpXser7e5VrOzKXdq7Q91anrjO3/wEwICNjSzUFb+?= =?us-ascii?Q?+x0lc10cqoxjEAKCqDstHb+RjpkNNCPyHtrSGfvv1w4dVm2A7vawwIg+wudl?= =?us-ascii?Q?FNLgxL6oK3IGvTwzofQf6RgfgZsWPcYqfrSTBTS+eqS3Yd6cV2EQ3AvWR7zc?= =?us-ascii?Q?syR0AifQZjS8//YKO2XJJGyo1YJzr5RWvoG2RMTxHHCQmGxrBLPLaS8j509X?= =?us-ascii?Q?dfulJIEw/OwKPinCRXJXkhvsCERfle226kth5APo9GP3ZosAPNsbYoSeBfn7?= =?us-ascii?Q?ngG9bFYePL4co8qHQ7czN0CL0wKDsjk9/ZeNoIcpFN18oeMlkE53ctwNOmJZ?= =?us-ascii?Q?MGc+k60HKYqUMVT0rhmmM883HA5SZdrQqey1Wg5fNulJStWXqf0bo+vwMCCM?= =?us-ascii?Q?gv3+6LA5JmbEiZLwzlueRZYvuFqHSAf4gaU19Jtc4qn0qhDQwYoXG0viWfHz?= =?us-ascii?Q?cmAanaOelzAFEjnsgVsZve504O7oyEQJRa+7rOoV6LhabNGCS8QaH+TUUsE/?= =?us-ascii?Q?6mt8lY5qKjvjDaqE8jtLvF0mP+XMZTgyoN18XVT2eUu+Xm8PMK4n6Mw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 6:4TXRlPXD8PNtYWyOFuVT6f+GJG6OngeDPcKhtJggwIPpfj/GZ80zkDCWoutLjeonlZ+PKUbpTuTm3AFOTn0v6F1YXTDx9QR+oGl1+6lItkJVKFlGiRu/y5HUq68tuHoSTztaezUJxEJRi8EcKW9vZ07PI+xUPHvn4GuapapushEMd93okKpTKlvjt0yZOZt/nBm8Eg9ldCBhEaFBDeuD4VUmKqdQirF6iAhHGVxRKDPn0oUw6dUDiXIRne6dNLUqMhCVc3AuCQCqjmzm52U+hFYvsjksVDSntepupwIrWEOsa1tt8pnPftyBsBSXb6y4xlf/PHTC9efex8m2tspgyA==; 5:7I4MYAg8O+xK6R33vL2r01rJNq4hMZbHYd2L0rwogPodqKJ+4Hjg+CSC+yTuxc7pwbJy2BL9hO6RGb+9JwiEVJtlIy0U0I0Vg6844wV8IhZPXlfCu5SPOHRL50lm9y4JWqzmcvf08k4pI1o69QSn3g==; 24:ac86S3DY0vImjNCxu8ge7+hmjNkQtvvelgmWRmwJKTkyqqdn3sD35R95HOqE8IcNUipVVtq2WVb4hqvmBBW8SVqPlL2ctNt2sVylbDibTFk=; 7:SAxHdx570l2DorGSt2OABrbUFm+k1q2XWCnau5VPPfB33QNkD0zMehLHeXokjvrBpb8/J9cw9Xvx4ePjVM4rWvxrsJwqvuyLAAf9zfn2eqn7lSkV3oYMoOIrb2BrKRW/JKaPTVeAmW/vZFFxl3OTP2GOO3HFHh+MHlTwvFSWjASo4lLXLn5bFNdU2Si19tQ1nQf+w/y5AilN3c1GaQQUEtmaWzHtL16UW45AjpRCvIQv8Y2XVnw/nDsxT8zu2BfA SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1441; 20:sSOrgw/ZJ/8LCQUyCQn9yzSSUlxWZ+4hTz53JmG+1/ClPr88Pwlz+kslmgvMTgBIS1iWFcC1PMLsejrI7gLP80OokKBWSIbMdyOZXZ9h+3G3CnsQZb2lX7uY+g1Z20+4u2GunGq3kEKNJhhLSO0G54kkM4yb/CSn2MuY8Ctqrh0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2016 05:34:04.0508 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1441 Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 096/127] ASoC: use component probe/remove 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 .probe/.remove functions, and codec side is just relayed it. This was quick-hack, but no longer needed. This patch uses component .probe/.remove Signed-off-by: Kuninori Morimoto --- sound/soc/codecs/twl4030.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index a2104d6..4e05b7f 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -2163,8 +2163,9 @@ static struct snd_soc_dai_driver twl4030_dai[] = { }, }; -static int twl4030_soc_probe(struct snd_soc_codec *codec) +static int twl4030_soc_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct twl4030_priv *twl4030; twl4030 = devm_kzalloc(codec->dev, sizeof(struct twl4030_priv), @@ -2180,26 +2181,25 @@ static int twl4030_soc_probe(struct snd_soc_codec *codec) return 0; } -static int twl4030_soc_remove(struct snd_soc_codec *codec) +static void twl4030_soc_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec); struct twl4030_codec_data *pdata = twl4030->pdata; if (pdata && pdata->hs_extmute && gpio_is_valid(pdata->hs_extmute_gpio)) gpio_free(pdata->hs_extmute_gpio); - - return 0; } static struct snd_soc_codec_driver soc_codec_dev_twl4030 = { - .probe = twl4030_soc_probe, - .remove = twl4030_soc_remove, .read = twl4030_read, .write = twl4030_write, .set_bias_level = twl4030_set_bias_level, .idle_bias_off = true, .component_driver = { + .probe = twl4030_soc_probe, + .remove = twl4030_soc_remove, .controls = twl4030_snd_controls, .num_controls = ARRAY_SIZE(twl4030_snd_controls), .dapm_widgets = twl4030_dapm_widgets,