Message ID | 87vazaa5cr.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <alsa-devel-bounces@alsa-project.org> 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 7BF3E60754 for <patchwork-alsa-devel@patchwork.kernel.org>; Tue, 9 Aug 2016 06:04:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C0B9283EB for <patchwork-alsa-devel@patchwork.kernel.org>; Tue, 9 Aug 2016 06:04:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5E66B283F2; Tue, 9 Aug 2016 06:04:14 +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 B062B283EB for <patchwork-alsa-devel@patchwork.kernel.org>; Tue, 9 Aug 2016 06:04:12 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 045DB267E02; Tue, 9 Aug 2016 08:04:12 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 222CE267046; Tue, 9 Aug 2016 07:40:51 +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 D42D1266FC6; Tue, 9 Aug 2016 07:40:49 +0200 (CEST) Received: from relmlie4.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by alsa0.perex.cz (Postfix) with ESMTP id 1A6FE267066 for <alsa-devel@alsa-project.org>; Tue, 9 Aug 2016 07:25:21 +0200 (CEST) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie4.idc.renesas.com with ESMTP; 09 Aug 2016 14:25:20 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id C99914B1AD; Tue, 9 Aug 2016 14:25:20 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id BF6CF2806E; Tue, 9 Aug 2016 14:25:20 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id B85862806D; Tue, 9 Aug 2016 14:25:20 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id QAZ19696; Tue, 9 Aug 2016 14:25:20 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217010082" Received: from mail-pu1apc01lp0018.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.18]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 09 Aug 2016 14:25:19 +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=hxEzPcAqYAPdtsEFI3k6pPy2H3t1rJgVSeRo/dLNbqQ=; b=Y9K+hihSr6+t+Ehw7dbPs2blbQyS/0GyJto3TVa9juZUXdmm5h4vv1SHspa7pcpEr0+q+n+0yxXQPtQkgy9CocmDgLaDnZcQb0jMuUv4/TSIoF3vkStBWgKzHYOGyHpR1pGuHPcqyHVXIia2xHdwuK3VCDX5xKqCntfkXWDQsPU= 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 KL1PR0601MB1445.apcprd06.prod.outlook.com (10.169.69.23) 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:25:16 +0000 Message-ID: <87vazaa5cr.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown <broonie@kernel.org> 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:25:16 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS1PR01CA0011.jpnprd01.prod.outlook.com (10.161.225.149) To KL1PR0601MB1445.apcprd06.prod.outlook.com (10.169.69.23) X-MS-Office365-Filtering-Correlation-Id: 4783956f-966a-4be1-6295-08d3c0158cc2 X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 2:N3pR+YbvtsYFO+5Hil7CAuT6k6B67y3Wi1jE5WxilCf2KSSujFCHaQ7baH0PenZrjQAqzKJJIQLTM70Pa/EaO+J1JFA0Sqe/6bpn5xA/dYciguOSkNt0/ee7CsTFzhQJeRgtmHmLAHGmiuf4skRq2dzRi8FMKwc6qeVk5GMQR92mlXlk20UDsMIySsMZyoUi; 3:9U4y4htRDyMKGVcPlxQ+A3xw9U+d+V/I3abJiwdih9OXzHS8N3erprgBeD3teiUspO92Xz2SJ2hSYMa3xEFoI+8NLKbE+fLD16Hlxwa2SkTtnkF/a4DPTdfjM5u7K/pK; 25:UUwjDHSaZFDp06+8Q5BdeTIKaJtZU5U/dL4V4sz0bWJmq0Y/CCZsSnKh+WFYNWINiCcUR6YBvSMHnEE7TcUiUS9WGBKZEm8alskHByduzMhji8vnvjY9K4izdcefFMH+u2LzXOgPKDByeSm9nLHAW1O2atuiFotJuapD0J/TBqsiU4yj+AIpjEJU70YoXvg+YAYzaamL6BjzuuFe+vDifQ7GK2n1aBckZrvVw8KaOQIRJ+v8LKMpsv6rdXfSSvfVV/XiieFydCiwyMVXLEnjXGIyjrIO3A8LZeIV/NsHS/v4+XqG976ZkBfWSlRLOB8FY6NMdcTLIiLo9V2schgDbJdn5hktMS4RrK1qLPTAK12g6V9zKjqlUZWv+vkuIjkPAzSq/iICFJZ7QUNDHHVH+GOs+KKtPWeiXCego33gP4Y= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:KL1PR0601MB1445; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 31:+yzx5hSA+ejHdUKdSqT2vjmx8I2enpIpGoPS4AoBPT6F/qg04zFFXufQmOqRjd2bfMMDJkNJFBRYAM+86hiC78we0EUTo3Z6IZDQ3rU2YwCVT7PzNmDnH/g96WSqL6RnEX39TZfiYXmTeLNEBeQ9ibdi0BCj5TvGJ1MUQkfVNd9WUGa3J+0dc3ICWerw3fcgWwer16zD23LVY9RbdcVId2JXRBhua9QKoA1OsgfXm+8=; 20:lOh1spw6F3EtbBjcamihPZ0kZ3sS7NeYeYdeg2A4PVovVq+J67ac9/IKklx50DwD3ROtjrYziEfPRRl59ri1MsVyrvhwYbH+CHTWhsK16Nce385EJgNpn/Wnm8sqFX79oW0iaHnv9E0R9X9hh0WLiIURMg7znz8YEagwlEUbybCOXf5Ws20GZgZvTA4kG625VLVp32Ylh9WvByXRgJGHOdiaQt0PGxqIXX7x6REka9ZOmhY2b9sJCItzfM44VDnCmh38BAJPwUmraXHqutxIhWlnXFS9gE8S7fkJUVeEw1b9KmvGP+xaaqcK71WimLKIRl3QMsGwnW1jKpGwai1fOkmCHvwmZJXJxGbAPh8mToVqvTWcuKD2t5GRLkXX+4x50sAozDFv46tjZCADCxjgUuUzVzIB5jQb3z24eatbOM6lu7/vwDokDZyXK18eAgaCzyGtAoE9t5oMq0ltaq6OQCT0OnoDwSawqLN9Q0VVnlO7GsiJKIK/b+MYqW7oY6EJ X-Microsoft-Antispam-PRVS: <KL1PR0601MB144567C74F1145F8D828E30BD41C0@KL1PR0601MB1445.apcprd06.prod.outlook.com> 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:KL1PR0601MB1445; BCL:0; PCL:0; RULEID:; SRVR:KL1PR0601MB1445; X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 4:+oEiStjXDt+1HfLSE/z9KydPt66dsuL5NLSLgYk9nlUL3wFnBl9lZFybT3JyKu5JMejP14+afKFaIwxCxmsEnuAzxL0hn2B7/fy5Jux6cAPaF0OgZIcluSYNKbDYlJ+HeWANWjVlXN1KuWMJAIA+6mzpkllsq4QWx07C7V7HpcTvjGnnS5LDBPLQ5AbpRAeg7kDZJDU5jvcPFxEeUS6qTn8MRREBUOmbOvJgrQ6l6iVc5md3dSPEvyXRt3n04R1Z5zPI8BexkWXjCjL1HPjZ5ZrNdtSh2EiwtPixTb0kUzra2gHeasW42EQ/noG03TTWJdh3RKTzOkAvyhPCYdmJCGK8KbmZA41gsHclZNgfn4RlP/5a5MTvkBBhM9G/xbRe X-Forefront-PRVS: 0029F17A3F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(2906002)(50466002)(4326007)(106356001)(305945005)(7736002)(7846002)(92566002)(586003)(8676002)(86362001)(81156014)(81166006)(105586002)(68736007)(53416004)(42186005)(189998001)(2950100001)(101416001)(4001350100001)(76176999)(97736004)(50986999)(54356999)(69596002)(19580395003)(36756003)(19580405001)(23726003)(6116002)(3846002)(33646002)(46406003)(229853001)(66066001)(83506001)(110136002)(47776003)(77096005)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR0601MB1445; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; KL1PR0601MB1445; 23:gk6lJu/Wp8CKW/FZqV/J23xkIOE8qD0bO483Uer?= =?us-ascii?Q?q8sJ+0/tPkDOaxCh+9FWNRjYkUH8RbjUXdZhWQPVjB67wEV7D/XBYGxTb7x+?= =?us-ascii?Q?wdHcMAHlZeXTB0WnRgUgG1ouZdX4HeoXXDGJeqegPSJxhyyTmTGYIQTYGgjP?= =?us-ascii?Q?HweyKrhwixw1kArpDR+wNHvHknJxHnskugUNRK0px9LDz+firmA6qG3rULl0?= =?us-ascii?Q?S5sGaI1kDU3zv3y9c/DO/B42BOx+dg8uxlPlb+EGkmd3taD32qrxnSlKMrMJ?= =?us-ascii?Q?5XSCdldPD5OKhYB4kyXRStwyIoTFncngHAHXh+AGOT8+Tb0fM4TGew89hO13?= =?us-ascii?Q?nwzf5jjD7oiQs/5lF3Pl1LSJ0BiiRx0cn/0gHDPdq6OaA72kCmMrfxpFFb7L?= =?us-ascii?Q?4f+utZEIo2aBOMRXqbBd6rAEns+u3c7+I+Mt9GK1cqf0wrOX1ZAqzlvLv1Fk?= =?us-ascii?Q?pvHYvsUgiewpO1WucYGyHCOocZkXWMG1SY9gJHQsKtLa6OKBS7U61jIf8FJf?= =?us-ascii?Q?Ji8m6QmlB1Md8/YxKGN5ylD4Jx+1wB3jPNkjC3VplE+T9WcaPqzIKO/iMIgB?= =?us-ascii?Q?Dk9sFIpPzqQFypaxs0KyJr/KnOf/e+chLnJBoOaGeC1qOtTwP1DwrGV7oiVF?= =?us-ascii?Q?i2snR6twoLg51kv2LPJOWLSgVa86/5WqkHiGj3kv6LGzfnifFzM0/sO9fggv?= =?us-ascii?Q?3qUHzzAtIuYBRItLiIpeM6FqC+QGJ3BhwLZMlRAkxyF2rM7vDo3s2nKTNt6U?= =?us-ascii?Q?VXxrv36lpoqj+urnavQ8mxPdgdbYb3G79pg2j4PcafC8ONdBB/WEyxVAHx0I?= =?us-ascii?Q?s01fdtlD6Cdd/rrm9uMIuyHJlNULHzJ6HL2/D21uLTmZCS75j1oYUvGags7L?= =?us-ascii?Q?LU3gVJ87ckDUoxnLYyhaxg7zk0zUTrWwgM5/my9Q9U4gIuLFlBIbo0F/Ogtr?= =?us-ascii?Q?2fHKWtGRI6yOK6/qnaBVshgav6bjyv6ZKEzr0RitTMXWevnOhCWaryeMp66H?= =?us-ascii?Q?x1JS8hMW0MTwnVYZ+UwPF3ohobYvoudoO3Ux+Dlb5pDFP6ze+LIvWZZ+9mHd?= =?us-ascii?Q?Wr8Tx1GhpebS7lLBL7KZrRVBzv6wqafSPw2hbMH8JtWLpqYIpp31tRsnCLRv?= =?us-ascii?Q?vdStWdnEMGE9E2LbSpNDjSosVRFoM2yu9V9IgpZ3zJ3QLv7VNxXcgSw=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 6:anAvIpPVM2ytddLrrs//eXHo362kai41GaC6R+okXjZzDhmk1PbxQziN398tQvE2Sk+srO8RAOxDOXHC/FUYuoimnsB9x6jxjWnPCPhGGwb5NVuyo4HlxCEObUgqju1avNpdzjZaVYi6SfgZdsW6CAVkcwoiPy90pG7a6FCuC71xbBBmhKvfEZo16OZfSkxa+glXLs8MRQG7+fcmO5iwraJD+jr1IsIxNBLb0gDuFvBZcfIk2ROfkJ/vAGQfTl6kKhm5k9PrFOhMXc337QqXZbjpTtLiw5bNxmxONC+VeX6L1ILC9NdPIukYU2wnLYwKHOaCXnuzhNs/SwMTA7820A==; 5:0BiosJbkZp9czsPDgJzy//Drs/Z0YkTrFlYrFs/apKOaaxV3+0JyhxfIK6AiI1g4HthNt8YaYrOWGUB/HkZ2SLu6UT6g+SubCehIw4yJho4aOS+2wa4rmT+h4gUNpbFg/bRrQwp5wxSpD28cVY3mVA==; 24:zyhiL33fCxxBdXAqQKjP83BdCiPn6YH4e5JS4R9ExfJHvrBMrFHWMGB7nn/YqimZIb2hSqy8yLWp6FYkgyRAVttEqub1Pw9c96jod6bnKDw=; 7:ZJZvUUQYS216bhejroPBtWs3/JPM391GkZF/bBtul9+AXrrsVAHtUDxBfXI5BOtogHN+SBMrhwt+h3wEY7AzjOf4XK732qqVrcMZ+D5wN67hHyuDa+bOBLV1CXl2iTRv3vc48SW/Ncob8Bkwj1KBdFPzwy7rwFIkcfeLu+0cEfoRUEuct+O6hGZ8sRftjItISqwhsWEXTp/aReXcAlcb8Lg+k7wQvcTDV8cPE97ScFDFw7QmcbunA8jy7N/mo/VN SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; KL1PR0601MB1445; 20:E+TTB4B7ZUNJKl3q+ZqilFVyei2FOe95pV6p9TSgyPs42VGbisp8UOH/hmwRThC4HH6W3WUv92nlBy76zNCGSof60UMkwe1aMFjfrD124BxntyZ28lSGTGRzwuqreZi3aXcdkEDQTUseql0meThHhI0M8+2iKbV50630RK3+k3w= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2016 05:25:16.8719 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB1445 Cc: Linux-ALSA <alsa-devel@alsa-project.org>, Simon <horms@verge.net.au>, Liam Girdwood <lgirdwood@gmail.com> Subject: [alsa-devel] [PATCH 071/127] ASoC: use component probe/remove on wm8996 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" <alsa-devel.alsa-project.org> List-Unsubscribe: <http://mailman.alsa-project.org/mailman/options/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel/> List-Post: <mailto:alsa-devel@alsa-project.org> List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index abacf6c..43e01bb 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -2614,9 +2614,10 @@ static const struct regmap_config wm8996_regmap = { .cache_type = REGCACHE_RBTREE, }; -static int wm8996_probe(struct snd_soc_codec *codec) +static int wm8996_probe(struct snd_soc_component *component) { int ret; + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec); struct i2c_client *i2c = to_i2c_client(codec->dev); int irq_flags; @@ -2671,8 +2672,9 @@ static int wm8996_probe(struct snd_soc_codec *codec) return 0; } -static int wm8996_remove(struct snd_soc_codec *codec) +static void wm8996_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct i2c_client *i2c = to_i2c_client(codec->dev); snd_soc_update_bits(codec, WM8996_INTERRUPT_CONTROL, @@ -2680,17 +2682,15 @@ static int wm8996_remove(struct snd_soc_codec *codec) if (i2c->irq) free_irq(i2c->irq, codec); - - return 0; } static struct snd_soc_codec_driver soc_codec_dev_wm8996 = { - .probe = wm8996_probe, - .remove = wm8996_remove, .set_bias_level = wm8996_set_bias_level, .idle_bias_off = true, .seq_notifier = wm8996_seq_notifier, .component_driver = { + .probe = wm8996_probe, + .remove = wm8996_remove, .controls = wm8996_snd_controls, .num_controls = ARRAY_SIZE(wm8996_snd_controls), .dapm_widgets = wm8996_dapm_widgets,