From patchwork Tue Aug 9 05:42: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: 9270409 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 629FE60754 for ; Tue, 9 Aug 2016 06:47:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 522D827FAB for ; Tue, 9 Aug 2016 06:47:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 46FDB2845A; Tue, 9 Aug 2016 06:47:49 +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 DB44C27FAB for ; Tue, 9 Aug 2016 06:47:47 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id EC6C426836B; Tue, 9 Aug 2016 08:47:46 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 77E5B267112; Tue, 9 Aug 2016 08:07:11 +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 15F13267085; Tue, 9 Aug 2016 08:07:09 +0200 (CEST) Received: from relmlie4.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by alsa0.perex.cz (Postfix) with ESMTP id 9C125267085 for ; Tue, 9 Aug 2016 07:42:50 +0200 (CEST) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie4.idc.renesas.com with ESMTP; 09 Aug 2016 14:42:49 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 490A662179; Tue, 9 Aug 2016 14:42:49 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 344FC2806E; Tue, 9 Aug 2016 14:42:49 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 2E49B2806D; Tue, 9 Aug 2016 14:42:49 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id QAH25241; Tue, 9 Aug 2016 14:42:49 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="217011624" Received: from mail-pu1apc01lp0020.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.20]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 09 Aug 2016 14:42:48 +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=Il8tsoWwnWAaPsCMIPaVhfeUlR7PMfMvpivSQQD+h2A=; b=AWAR0bM/SHXM3ENNowETb2Rh9kCas4bg39NCmd1KBeXxpRyajROcHc/1Qzo/g4ao1wRXr9ChkzZu3o8vDw+Vfgm4GgwI9sbZ3R7ceGtVocGgCVOndPy/QuMfqTlWYdQa/cmfgGGEOrSB6fr6VsMCxCJsK4yFyksSPbtQAn2Z66E= 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 HK2PR0601MB1444.apcprd06.prod.outlook.com (10.165.182.150) 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:42:44 +0000 Message-ID: <871t1y8pz7.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:42:44 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TYXPR0101CA0015.jpnprd01.prod.outlook.com (10.168.40.153) To HK2PR0601MB1444.apcprd06.prod.outlook.com (10.165.182.150) X-MS-Office365-Filtering-Correlation-Id: 76002ff6-edbb-4a46-8ab7-08d3c017fd23 X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 2:vncvPZAMXN1k41o5kzIjK9DuJgdO/dnuZtqWEXRJo+Kc/AWF2v7462mL2qLI0uOxRIUirszoFK2uI0QzEUAz6WhQmVe/9ZSo2/c8zhZCLWw+eOb3E7nxJmtxXSxLdyMSwgsqh/hu2HWjo2zB/KQbm2sEx/YE0bSjBePRQjrBGJSmla1vcPpEpIck8bC38Wdv; 3:yVs6o7Pl6csFK42BaiEammEn6iAskaPyvFDhRammO18aDZAMGb3De5Cr8jEG/ygHi4Hh2c/wOtW34/Rj8D+ARy3d1f7vPj1UqyiDFfuHdbPMU/kT7zqWOZLdNtFuT4su X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1444; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 25:1oeG1jbvMQESJNZVuIT5+0sSahP38CJt1+JffROSyDoTVYmO2Yc9kSZ+l58fTBK4Z6+u8l/gKqyF9Z3R4BuOykUuSFz7qlVoVIYvF8+l2lIjCfuv+Csf+BVffilFP2MNnpDCs2pus3qVHyCAJSQsclR5r3B28usueA6dKGGweMrIqgSJ35v+glkXrPPYcMt5JILc7xgX0bDhjBMeYe3yVr2nmal1SfqLR7VSEnbIqoarUsJvyy658VMSilvj8dZ5qNgj+iQO8DkMYMX0+DWcgepSIaWh0aypKDjeN9IV+dyWpeQGXMVjpchM3ORt8nPoMemeqKAyApjc5xAYTVwOrpR73D/K+bM8V9OFNv3572jevNAHEPqaisQBOCDsRbnF2fnRzyMNE6Kc+y3daX9ezSapSanfClTc6/ZhhNF7uIZKHz8f24fSME+e1Zpx2/T8S2/l4TSE3UYC9BoQWdKCFxy212F+9HAcV5AE4iehexPtzMb03NhIvLR3IwEu7jiV6aErVDN2zfZks+DxqRRHMn5OFO03Tt01B0K/E/L7VacKWWDudlSJdRnw1HUHnhMpDayYRHj/msAuxdrLCHVf6YuOhwoXwnV2a3Mm/+6t85ebqiXsyDwfHVIwbHuKnwWmAoeH99jd/cIjk+MkiEeUP9zY2hPBdQn2DBOqkowR/fqwCXbxAh67mimNaavgXBSdmOBfpT/hnKfGyI2Ue7e1bA==; 31:T543bKessFPQ9yWoW3Y5XEFmfm6LuOL8xBssuMbuQKXIQtj2hFvop0F0rwPyy9U2CoPbGZAxIk0bB169vnNWsoSR/vxuK+a362sOLhWqXlbzVwcwOIl087VUISWf9sAr/B5hM5VT7wBrp9o3OgTAfl5NVYNnKySsq0+zOzt6/VWXR1ownXQBOLFnJvno/tixrt6kYSSPxZIjLrDVT1Ac41pbQzQJ19o85fsiElneUXA= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 20:f7exnNILVdf0sFNY54RI4Erf7Z33LstMyxdziHGK/UOWSEzQOdXmSjqKwev5nkh6QrGtg5GbjQNNwVLg4iLN6kX1P6X3YGpmi1ESvB5fDMTNA2PuAJzpQd1TDczajFKPgtFF7+uX7VFKI3nh+8yhIbZc76eugO5ii3SEeGzxeMgGuJ7nXZER2vnGAAtC6uxnZBluD4SvCCnJClE9jEbvp99qwwWRdj5ZUdYwWKvx6iqouhdQJ0R+Iyt9q0jXRf16zAJ4g1qKh+UwnFgyS4uGALEgQAkSw9TZDDQ+Dvhaw3JSDtJ7F0GYiEBc1mi7I/mQhHayjBWjNiL0hjr7Yp65SgdB/cBGumvYET0ZClfSUeFtXE+9sDeGr5lqFSQbMH9ZGS5OGGzld2OCUfQFmrnWBmv7fqgM7eic3auAz8PmKJyTYNXfPSG9wxDHm6ZiZpnCOG1XobEQ+90QSo2ioHkAaZzCm4RCddBiqEBiXRRjSA5vT0MFWUDtd0H8lnqxaSiT; 4:N4W36T9qLnBOUCEAR/WXioBoxPFbw+4XNOiOwyIWUGta5+Sgt5kqygnVqseSDqrw6g4HMwSb2luv4KkHO/FRtjVSxKlbCX4o8WW2nKNpFIyXrUYHPkNEvPcHfA+AVhIa5ix4AoIM3INzABKAcCFR96TZRFQBMZNJLAzN8pDuxPkMPlCQVVsNprFy+0QYe8xfGyiZ7vvMkcH4EnJiOVbheBIBKMMtwosAVXKjWWnWcvtQ2cU5f3fi3IK9ustXCVRKzSvn0R/FdFJIQQU+t7QnLKQJ7czFgp8Limb/pVHYxmwGanseJrUNqEc54UekaC8QSeHx7uPVka1rNjlUzuVnfjLRBvBc8ycTX1Q2uiD2oKmQyHO4x1ez4Ic+JHGyzeW3SU5YsIxGQTjK5zRZziyOHg== 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:HK2PR0601MB1444; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1444; X-Forefront-PRVS: 0029F17A3F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(76176999)(54356999)(33646002)(66066001)(46406003)(50986999)(50466002)(19580405001)(19580395003)(69596002)(47776003)(86362001)(189998001)(3846002)(6116002)(106356001)(23726003)(8676002)(110136002)(92566002)(2906002)(77096005)(81166006)(81156014)(83506001)(68736007)(97736004)(36756003)(4326007)(4001350100001)(42186005)(105586002)(53416004)(7736002)(586003)(101416001)(7846002)(2950100001)(305945005)(229853001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1444; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1444; 23:m5k5ervEOGEkrqSkxwL8NR/4UHEUgiL1jHHUKD0?= =?us-ascii?Q?8oyx2Qb/rNzNNVyJ7GHZp9/i2kdCvTzdvCxxczC4YUWA5ckfJWOcRfyDSowI?= =?us-ascii?Q?/9eNJuH+lDU9npbrERTcw/SGm3pT7dnc1lXY0j1rJ/xH0ctvGmOsVDvPoUdT?= =?us-ascii?Q?ZIKokt5gJEPIB5F8cziEltPX81lkE0hpsCVauhNnnkWDC21E2SZ6Exz+MFkt?= =?us-ascii?Q?OBQ8Xkftv+zFif29yMbU6LetQVYmUjaIsCqn5RxtIaVBiUFvxbNE3THA4f6s?= =?us-ascii?Q?z1ha+KM/Ak3P52t0OC3ZoiLyWOXJdQUfLyxyUSaTAmkDMzGIJ4ou8CcS/Pjx?= =?us-ascii?Q?dFYXoLj4LOWsaGvgX8ZVU+VyQVaFceHNN55MR45SvAkrUxHY+uU/YGp+4wos?= =?us-ascii?Q?oWwrcQvURQGxJXfnF+2WMsD79qKsVuLp89HYk1EQv4DoTKqfNjSsH3hvbB1P?= =?us-ascii?Q?HvSYly7gF4V9MtN49nOBdwkzrSxSrl/E86LsRwMMOx3D1W5Dcje1YfOwPzLK?= =?us-ascii?Q?BpYL5cp+LYDduxQomodtqq50m9AtM8ZTK8ZmswlrI6F0u2/bmTpfJZtAFFWo?= =?us-ascii?Q?0EwYo7yl75IJwmWgRFQVhEWHLiFMgczw/o7HiFDGLMoWYXl/wQWrKF/XZy/p?= =?us-ascii?Q?grfqPlXihEF+56Pf8D0xFQRKOcBE/l/3LHs9tU4lL2LTF2dZv8NN4vusIxFQ?= =?us-ascii?Q?Gi4Yzxn8Ze1KXHcAlPc7AhTOJkfDlg8GiZnzxBgZgxXqvATYf7SOdPWc/Fqr?= =?us-ascii?Q?Nkh9ZiBQKVTyeT43ixw4fcmIyFuKtF+8C2PQt9/t+pZWjyWR4wm6VzZuDfqN?= =?us-ascii?Q?kpFbeVQvBzC/sxQA1JYyi/U9AkdKkQYr3SqbGf4R3qUQEVNEt+4K/3LtZfIY?= =?us-ascii?Q?qn19KoU0RA/ndjW5Wi/DKZNg5prXlyRc7bGAr/O8dp5yPuZhxi9JLjiMTFLo?= =?us-ascii?Q?iFq8l5ObHcC1TpzPCMVEptaQ0kJkxXOJsSLcV3oaO/BhdseZSJJEEMlp4lZr?= =?us-ascii?Q?NqpqGTvXENi0zsQEdt29O/FdhPfkrIuuf0lKDu275paFTaFufmxFTw1P0tUC?= =?us-ascii?Q?j0kfBCUlPaB7/XjAnjquuF5X2sxKJM9WI/xe+OJaOYT6d3e58piBxAFMkVqM?= =?us-ascii?Q?VMMdRPbev025ifHyF4c9WPeLUHlLDVofyGQ2D8u9flx9l+LNdUYw4GQ=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 6:HALEjdVDzM+WuH/fxBgn8xzpVUoEMdaevsT8PxZeJWmBNOIa60F7azPpqWvufaqdGiho7S7oT1KBG0BqMdl8UqeUEKnFG3dJPgjza8P9c8dq4JsbYWJTfa2JO9Q4whKp4WiCE8Cj4vnHbs0HO99JOWAnyKsIjzXP3eWq4WGVVV+/K5ZM/Ou0vGFfUMY9C6aSc2hldwhXvVCgiynodIUg23gMHUhMkb32oY3kH/SJnayuiliizqrc0aAd8oA+Vafr7GEued7RBcesJHTETdJbLJQxxzEia9jw9EXi5poa89D/ZHnCzUOCjdtyr6yCRHtMJHtojxDhSo+dzUUSyNveqA==; 5:JRPU6N213wyqr8I5pT4rkeoilkE9ZmfezGEZ0E5JRjoBqX6Zx3p2lIITaU60RvrGdT0sBpOLlVsCvVttSzvdHnoa/y1eblLmU0TCasoh11GKGyfzLYVrQN6UJpva1POWa3KhB0fwOEgWAp5m6IXfaQ==; 24:KAG2m7Q9FKFqxvzjpZmUMERFmPt92TVLqIAoMDRfSfY7PIec355ftNeyJ/BExTf52hQVN/BvP3OAZscskyNcGOU/xwei6v7FNaZLmbzLgRg=; 7:mRjZKv4FVjOxSvVjtznkXlZJBDkupev3/Q/OwIXp/3Gwp4mOMlZR9BZjHYajR4+I9F+PDmvaT3Qlv4wzACfil3ClVjfqFze99C4epxFc6btXskIAZyu3PwHOLZ88OMvwuEuRkstQNoHiQ5HSxoZa7a6j72FHz7wkX5FVfUl60Hqj9HuikgLOkdRRg1LmzYt4egiSPk+e+ri0vRAwUcR97KdM9PPnKBMaCE6zpNRo3Wkk2n8KaRB0gy/BBq0kNlrH SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 20:nUNwp4BQRZVBadExKccLTZTw3XFd7d51b25HPAF/Vpud32LG0QKKHEpQKuVY1oBRVNak0/Dqmk2GUZPW0xDPXL13qSx8x1EMH9NRz3r81DKKJ5XyA8oym7JlXGoMQ+/2f7WgrpTOemGVlFJ8LLgCWmAuPWP11E7JXfrEFQlsHMM= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2016 05:42:44.9124 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1444 Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 118/127] ASoC: use component probe/remove on max98357a 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/max98357a.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/max98357a.c b/sound/soc/codecs/max98357a.c index 6a6b68a..b321424 100644 --- a/sound/soc/codecs/max98357a.c +++ b/sound/soc/codecs/max98357a.c @@ -59,8 +59,9 @@ static const struct snd_soc_dapm_route max98357a_dapm_routes[] = { {"Speaker", NULL, "HiFi Playback"}, }; -static int max98357a_codec_probe(struct snd_soc_codec *codec) +static int max98357a_codec_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct gpio_desc *sdmode; sdmode = devm_gpiod_get_optional(codec->dev, "sdmode", GPIOD_OUT_LOW); @@ -73,8 +74,8 @@ static int max98357a_codec_probe(struct snd_soc_codec *codec) } static struct snd_soc_codec_driver max98357a_codec_driver = { - .probe = max98357a_codec_probe, .component_driver = { + .probe = max98357a_codec_probe, .dapm_widgets = max98357a_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(max98357a_dapm_widgets), .dapm_routes = max98357a_dapm_routes,