From patchwork Tue Aug 9 05:00:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9270169 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 6342660754 for ; Tue, 9 Aug 2016 05:11:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5008028435 for ; Tue, 9 Aug 2016 05:11:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 404782845C; Tue, 9 Aug 2016 05:11:01 +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 5FB1628435 for ; Tue, 9 Aug 2016 05:11:00 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 522E5266B14; Tue, 9 Aug 2016 07:10:59 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 00558266A89; Tue, 9 Aug 2016 07:04:44 +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 12F21266B37; Tue, 9 Aug 2016 07:04:44 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 1B9AB266B62 for ; Tue, 9 Aug 2016 07:00:32 +0200 (CEST) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie2.idc.renesas.com with ESMTP; 09 Aug 2016 14:00:31 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id B4B2D5F60B; Tue, 9 Aug 2016 14:00:31 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 94044480A4; Tue, 9 Aug 2016 14:00:31 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 8C3CA48014; Tue, 9 Aug 2016 14:00:31 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac4.idc.renesas.com with ESMTP id QAG27577; Tue, 9 Aug 2016 14:00:31 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'208";a="217008206" Received: from mail-pu1apc01lp0019.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.19]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 09 Aug 2016 14:00:31 +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=Mdl5MWmJo5TJfovMkXgLkdHV063SeLL0rABzpmbO0VU=; b=m9VwNma0KSAVoTHQXGD/HUdRo+nxzdcbjlB/a3FK3cowcYnxjdPtnRlbdI74LTsKLk8PEAKcYVpGyLiZ3712zS+Si3QK5SvwlItKvL7OzJyNHadhWmpuBxx3ThHs/l/gYZfCeX9u0o84LBFmfX7gGh/b5Gtey+bzAgNhXOoiMyc= 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 PS1PR0601MB1450.apcprd06.prod.outlook.com (10.165.210.154) 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:00:28 +0000 Message-ID: <87ziomczn3.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:00:28 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: KAWPR01CA0029.jpnprd01.prod.outlook.com (10.165.48.139) To PS1PR0601MB1450.apcprd06.prod.outlook.com (10.165.210.154) X-MS-Office365-Filtering-Correlation-Id: 0d5c239c-facf-4e2d-6d84-08d3c0121501 X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 2:dY+BsI7l9/rWLvAAy9LoRp2eUIO7llTjcCiaxHKYXgvESiHlJ5RPhTcC/zp/bdKiJgdH0JNb9e7UYODgFw1yHl8aYdRSzS/UwPs4HTKa+fZFUgb29V0NUA84qq93bBXmyAwdPRaqseWnHNcQXqUNNaAr3ripiLyG+qE+iLZpXbuU3LdbQQStdRXLe304SjD5; 3:BEJSb7n4htAaA4DX56KgU2l2Y2QT6hUs4j8dakY7L9DgNthJhPJApY0Wfx0suCp1GpkIfBpKpZbvlLeTNLI6wxQleEa4o5g9qgnp2xBam+lnTjd51zj6WBmRN1J4lmzD X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR0601MB1450; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 25:V5muuYeOlQ4d7lbxUikzTylC0HFb+DcrIPPuI2gD9DsRMiSzY7q1r2sNJzv0V6Yvj+DUIPWC5DpeSAKtYT9soA6ai3wV6u29jNnoQs57mzAbbrkmhSK7D8eHfff/ek8J+icmHAyWahZY25LPpIn5upbehnfbWeMh/UsTSNmiCDTH/CklCclzd6V7bqpDZ71KpEA/9Mj97IjbGjBwWUVFMslQMzyCLTNN8SjTVrAbPWqha3flynWrLptEvZtO400y5gupV+Iyu7DYWkCFLr4qNIWXGbo57gUiJG6BJ6VEWdimU5BZxd9NoKsiDIzieJCIeX+fAjub4Q/OdXkMOGxY8GG4xtw8FtQz+EqXlJieCWrEWnIfnWVCAURRDi97ejZm3EfscpuxnLaTwP7KH5cb7rJMy0Hh6N3o8RWEPUHaqCCSeXbLZkqBUmA5DCAvd2hXsUeuCIvX4PLKSq3a5GHTwK5ou+yVDWv7KbjzYgr+JJg5bWwk63bHUfEaUASEq1+KUtf0tralOHNboQFA/sHJgZUyDS5jn90/UHYcTH/UWnIA1KapcvauIozfX+5qz+ZStMKDYmzXq2aQIRsIwGGDyex05Kcf7V2l3EEn66HyoCwKRcsyKrnQ0ygmwUi8JLygq+VuJD6/HNoJM30J/dY8mClik13Fsjw4vK5GtQdTeRNmZQzz7QuS+BQm7C8JbQad1RGs4teDj+2FO3x0GRDt1Gm+YFXGnCtEmJAdlPjBxeg= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 31:7gPsjhWyTYKbzRTXluUZkEO1GaSW+3Jux3zDyaT3fDUC9hYWHO/Fz+99gg70MSmhfbGovyhAfgJyPJ8K/fIo15xTZE6auHqAw/oQ5eXM9bYVBNP8/LGnG6uVRr7QTEfc+fT+TMoH4xxYLU1eocAP0QHMpUjozoyfDxjku4j1FOHqD5xofrsu+sJGGGIbbfXJtrwyiYyvS4hz0YmhpmwWCU9y/TArJXw+vBYjrl3bqMg=; 20:c4IaZOepPqwJrRZ51jtOHz6UU2O+KkbhMOOvYwHcSPPs0y9Hf+UfHhywucmM4XbjMTkLXBcwOghP5JbcVrVo5O4BPc+17+xMNXBFjGDi4pZmoUt0hDRkWyGLMAhU60ESaHD5Dxo0KyRy89DqTyspYXxQDmY+5tnTMQQ0PixX41Q3nyPEus/xOSc8NiSjvvCeBPxaOmN4s9+SJGWGemqAg1OCzZ5hDxqnplFm16xrtEUBR3mYKL4KX9zKHm4Zj5AivsMdFgCeucFE+jdqaLYsVS8cpo7qkSOJIhJAT+SsRzttHj617JFZq+h3+ABaod5Km1ZU87uXRBwwB/WlfQWwQYeEnu4HfP05fudFY8jbhkggzeIPmHOZH5lAJC2wQuFDs7U5L5fUxCADB/jzARU14qcr6Wn4aGmVWxxq1T7GMpfTJTEuPK2p6RozyW4kshCQXfHJj5q/S/+848JTDqCwBn48wi3rl23d4gLSSsOmuEcoBcKOKeeC7Veuwnp6HuEd X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6055026); SRVR:PS1PR0601MB1450; BCL:0; PCL:0; RULEID:; SRVR:PS1PR0601MB1450; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 4:R1Vk0t8UNuLpIh+t85Uf8MKEpn69qzlj/idP2zq5yG63X5YFpNngWe/NCNxs+x8N46f+f91Ij0J7Avow9HBAz0+xMXNemLsj6xTroBSdEFycHMpfshQEFDkg1Jj28k3eKe8NQI3AM2SfxFiVBcMzHwZEYCLfVRXBWIGNI+nLR7Qcn0xH81AOw0HwA57DPBYa+9vPpOwf1VVNDy17Z0qR6XkWF4xq1hsSCa56cUCM9pzDc/7/VTRk6CNqbxeR5dQZMzhV60TRrp1Vcye/h1yNKkndYl7PVUDhRDRAhhcpWGXdQIwY83lM53RQ3U+qyhG+osudWccQRbbYAbdfUNjaw46n1hHtrnX3swmpRE6uaBZzqaCZuEBsh4c0NkMz2xTu X-Forefront-PRVS: 0029F17A3F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(189002)(199003)(77096005)(2906002)(46406003)(4326007)(2950100001)(81166006)(8676002)(81156014)(50466002)(586003)(229853001)(106356001)(105586002)(36756003)(3846002)(6116002)(92566002)(110136002)(4001350100001)(97736004)(189998001)(33646002)(68736007)(23726003)(47776003)(66066001)(19580395003)(19580405001)(86362001)(83506001)(42186005)(53416004)(69596002)(305945005)(50986999)(7846002)(76176999)(7736002)(54356999)(101416001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1450; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1450; 23:cZpURmcnYzxFU4dZKJFBTtiG2WW0UQz1dFjXql5?= =?us-ascii?Q?q23WlRJXVsRR/+EY9SCHk7FDg1mqkXD+xYDG58havb8TdOwdMFlHt/6Hb1LU?= =?us-ascii?Q?eydatk2YKPGWWRuKNdfZ6lVmyfu8jk3Eu2gtxLcOV4Blo9lbRvmb1mUYVoUm?= =?us-ascii?Q?JVeo7xGYe2hXXkr4uZJxRRGXXYZI+W7g/4rslDXkzUcZVYUfQUvCBNHV4dsG?= =?us-ascii?Q?dgz3wQmYgxu2gWmRpRWWbjTmFcN8RJw+rWG342L0JeUWQAWfU71gBgDlR79e?= =?us-ascii?Q?v4TGwMhgY+RE+Wo2aeKV3c+kptTruBh+c9Itc593X2M3xawWAVDUHycISkEJ?= =?us-ascii?Q?rm16EZeT1GxZz890spVnlwBy5meOsGi8N+H7znlW/0mpRUWwR33dD4FeE71/?= =?us-ascii?Q?ZPoH8YFNHgJCnj+Wwliev3fdauHfWG6MK/QmOXT3fjfpoPpPQBkbDZkbSlan?= =?us-ascii?Q?O8J3Otn+N4MvoFmbWtEnaltdvOiIJ16WRSISIhrnak2qEH/Z4Rq5eBSY5Goj?= =?us-ascii?Q?h5jr3+klnZhDap5dYtHlh/dOSinbenSJYTnkgSCYTzhzYAGr+d5KqFei/rkJ?= =?us-ascii?Q?6atMl7HAZfrQT23Z9Qxavu0jTD/sz/Q1VCHU4XElHMw6Rwc2q1QCdNkTacwp?= =?us-ascii?Q?yveC7ymVZR7d01qHavdEBFXhPwAqFsjGTrkwItEcwZqKsPMRnON94giyNR/l?= =?us-ascii?Q?KZt7IaG60VTJP7D2XEl29LGKswoMj+ro6/ANpuZeYwCN8ZNY1eAiW6KsaMAB?= =?us-ascii?Q?e0+hiIAeQsV/q7oV1UidFyq+Mi6gWffM8gNRn+6723DtXaiurGQ7u8lJLmBW?= =?us-ascii?Q?RkjRzYeJZfgdmU2tpi+nSti/BdXMsCL17up2c5X20ma3E8roL/uhmDrtUIqk?= =?us-ascii?Q?7PGOp2UnAleDksS/zZXxiSa0C0Mcdv/SA2O8YeNHgBxoEHKkwhAY0EoWPRjX?= =?us-ascii?Q?mC19TECo8KNwToJh4tRY2MVgII68tB8SMP2f7C3mRaXSjX+4Qzx1J4K8RvoW?= =?us-ascii?Q?07Nr+y+4PByqZHL6JpJeTiSdUH7aB//IQWMHyIxWuAV4pCVqS5unXBBjHpE1?= =?us-ascii?Q?3dDZNEHxOM2HeCcsN8eYYrLb9ais9FPPKwFHZGs1QepVQtPlf6fb4uk04DEK?= =?us-ascii?Q?/XIxrovCHdMjtaE9rPDfJRU6H944iiylEi0I26eJRgCKF9HpQ+sfqpg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 6:7tuaIpTdEGGiaRAkcxLUSrGJIod3X6bhbhFXhQRx/Ytuuu8ef6thVpzybaOROVXEx5OVSe/q1Po6PFasBT4MCHwKYLmdqIvvhwffLyonGk7tddzxUE1X2KZfoTX+vgBpoQxMQuxqsLhcasmyiCLonBAuwyPu8+VOusuVucPydYNIsR+Xt0QUJHYpKtigzg2748bCB3sPgslvqX4eQgKNMQsI05CMekpKsQIy3fKHQRglKOSUAyZ/EUphGK/bq7F6mFue6VAKqMHtNqsaHSVigB01RqLYDxy8UStcWwx33DIbO7KA3Ch1F+KsAS1KVI0dW8AgUzv6nUK4pVspIE8FBw==; 5:Tops0xOv8FCAcaISu9m9Xf8GAB5Rd6aavxxMM2ojwmjq4TMWZd7IbKTyNVX98ih6yHbs6dYpqgiQ89sR7Dm9zZ5KRWjvuLavdHh602Th0FczhZ90/ku8G3LdeeHwXAjoHhR2ws4JusWC61mBT2dlkw==; 24:9Qf/ujHLHfMTVVrzQbe/Ow3VYbglVnikp1uLqJi/H89Fj0h4WGX5iTjG4I22QqVTrag5EXne00k1C7iiLpkOwpJYLBF9VUZe/Cyz5/Zln/Y=; 7:ldajqPcAoxDG6niCtC92vIQhXZxPTJ+vyAo27rCg+u91bszRQQBxNIxn8/xVcq/8wnFupSiN18MeHIyAtol5y27ji9JtWG87WqiSl/Z0kHiDDh++vX8ESEusSpOUCMso1PkN8B+NqIrY0dmNTm4ugnKgaX/CjJGBojGCjeNYDdbnips04yE08j4PGHVk+gLAMKkm1maZSU8NpESdNf3300Fu7Jh61F+0oIBN9/tSga8m8EAPISk51Ek5KJNP1amP SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1450; 20:FiaaiS6kr8YFhhWDSoWrCwOr1wTr8kLbwC7GMN01QEmNMxm8S1UD5TIO+GQyvfivmDPFYlgJmTiiFJN1mebTlK2LmZchQEP+f3wEqaf1J/wJWfzW8LrVMN1pb7m15H+ZXHen8hsQ8s/vOEtMQurP16WsxZVCzEE8ZsTMk7Ubpb0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2016 05:00:28.0528 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1450 Cc: Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 018/127] ASoC: use component probe/remove on tlv320aic3x 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/tlv320aic3x.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 5a8d96e..502ce9f 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1569,8 +1569,9 @@ static bool aic3x_is_shared_reset(struct aic3x_priv *aic3x) return false; } -static int aic3x_probe(struct snd_soc_codec *codec) +static int aic3x_probe(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct aic3x_priv *aic3x = snd_soc_codec_get_drvdata(codec); int ret, i; @@ -1652,8 +1653,9 @@ err_notif: return ret; } -static int aic3x_remove(struct snd_soc_codec *codec) +static void aic3x_remove(struct snd_soc_component *component) { + struct snd_soc_codec *codec = snd_soc_component_to_codec(component); struct aic3x_priv *aic3x = snd_soc_codec_get_drvdata(codec); int i; @@ -1661,16 +1663,14 @@ static int aic3x_remove(struct snd_soc_codec *codec) for (i = 0; i < ARRAY_SIZE(aic3x->supplies); i++) regulator_unregister_notifier(aic3x->supplies[i].consumer, &aic3x->disable_nb[i].nb); - - return 0; } static struct snd_soc_codec_driver soc_codec_dev_aic3x = { .set_bias_level = aic3x_set_bias_level, .idle_bias_off = true, - .probe = aic3x_probe, - .remove = aic3x_remove, .component_driver = { + .probe = aic3x_probe, + .remove = aic3x_remove, .controls = aic3x_snd_controls, .num_controls = ARRAY_SIZE(aic3x_snd_controls), .dapm_widgets = aic3x_dapm_widgets,