From patchwork Fri May 2 14:30:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Austin, Brian" X-Patchwork-Id: 4102281 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CA49C9F271 for ; Fri, 2 May 2014 14:30:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9A2E220375 for ; Fri, 2 May 2014 14:30:23 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 7EA7E20353 for ; Fri, 2 May 2014 14:30:21 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id A6DED2650D1; Fri, 2 May 2014 16:30:19 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 675BD2616E9; Fri, 2 May 2014 16:30:09 +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 7CD2326172B; Fri, 2 May 2014 16:30:06 +0200 (CEST) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0068.outbound.protection.outlook.com [157.56.110.68]) by alsa0.perex.cz (Postfix) with ESMTP id 25D2226168C for ; Fri, 2 May 2014 16:29:58 +0200 (CEST) Received: from BY2FFO11FD040.protection.gbl (10.1.14.32) by BY2FFO11HUB033.protection.gbl (10.1.14.117) with Microsoft SMTP Server (TLS) id 15.0.929.8; Fri, 2 May 2014 14:29:54 +0000 Received: from mail2.cirrus.com (141.131.128.20) by BY2FFO11FD040.mail.protection.outlook.com (10.1.14.225) with Microsoft SMTP Server (TLS) id 15.0.929.8 via Frontend Transport; Fri, 2 May 2014 14:29:54 +0000 Received: from ex4.ad.cirrus.com ([141.131.36.35]) by mail2.cirrus.com (8.13.8/8.12.11) with ESMTP id s42ERZKi029094; Fri, 2 May 2014 09:27:35 -0500 Received: from heelrod.ad.cirrus.com (141.131.108.100) by EX4.ad.cirrus.com (141.131.36.39) with Microsoft SMTP Server id 14.3.174.1; Fri, 2 May 2014 09:29:53 -0500 Received: from heelrod.ad.cirrus.com (localhost [127.0.0.1]) by heelrod.ad.cirrus.com (8.14.4/8.14.4/Debian-2ubuntu2.1) with ESMTP id s42EUpQa032296; Fri, 2 May 2014 09:30:51 -0500 Received: (from heelrod@localhost) by heelrod.ad.cirrus.com (8.14.4/8.14.4/Submit) id s42EUoAw032295; Fri, 2 May 2014 09:30:50 -0500 From: Brian Austin To: Date: Fri, 2 May 2014 09:30:41 -0500 Message-ID: <1399041041-32261-1-git-send-email-brian.austin@cirrus.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:141.131.128.20; CTRY:US; IPV:NLI; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009001)(6009001)(189002)(199002)(19580405001)(46102001)(44976005)(50226001)(74662001)(77156001)(89996001)(19580395003)(31966008)(83072002)(74502001)(99396002)(50466002)(36756003)(83322001)(6806004)(77982001)(81342001)(81542001)(92566001)(50986999)(79102001)(85852003)(93916002)(88136002)(20776003)(80022001)(4396001)(87936001)(42186004)(48376002)(87286001)(76482001)(33646001)(92726001)(80976001)(62966002)(87636001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2FFO11HUB033; H:mail2.cirrus.com; FPR:E88D635C.CE00BE6A.F9F22B06.56B4AF83.2027F; MLV:sfv; PTR:mail2.cirrus.com; MX:1; A:1; LANG:en; X-OriginatorOrg: cirrus4.onmicrosoft.com X-Forefront-PRVS: 019919A9E4 Received-SPF: SoftFail (: domain of transitioning cirrus.com discourages use of 141.131.128.20 as permitted sender) Cc: Brian Austin , broonie@kernel.org, lgirdwood@gmail.com, paul.handrigan@cirrus.com Subject: [alsa-devel] [PATCH] ASoC: Remove IS_ENABLED for INPUT in CS42L52 and WM8962 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 Now that INPUT is required for the CS42L52 and WM8962 we can remove the IS_ENABLED(INPUT) check in the drivers. Signed-off-by: Brian Austin --- sound/soc/codecs/cs42l52.c | 12 ------------ sound/soc/codecs/wm8962.c | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c index 8a7bde4..c0581c5 100644 --- a/sound/soc/codecs/cs42l52.c +++ b/sound/soc/codecs/cs42l52.c @@ -50,11 +50,9 @@ struct cs42l52_private { u8 mclksel; u32 mclk; u8 flags; -#if IS_ENABLED(CONFIG_INPUT) struct input_dev *beep; struct work_struct beep_work; int beep_rate; -#endif }; static const struct reg_default cs42l52_reg_defaults[] = { @@ -962,7 +960,6 @@ static int cs42l52_resume(struct snd_soc_codec *codec) return 0; } -#if IS_ENABLED(CONFIG_INPUT) static int beep_rates[] = { 261, 522, 585, 667, 706, 774, 889, 1000, 1043, 1200, 1333, 1412, 1600, 1714, 2000, 2182 @@ -1096,15 +1093,6 @@ static void cs42l52_free_beep(struct snd_soc_codec *codec) snd_soc_update_bits(codec, CS42L52_BEEP_TONE_CTL, CS42L52_BEEP_EN_MASK, 0); } -#else -static void cs42l52_init_beep(struct snd_soc_codec *codec) -{ -} - -static void cs42l52_free_beep(struct snd_soc_codec *codec) -{ -} -#endif static int cs42l52_probe(struct snd_soc_codec *codec) { diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index 37986c8..b77e4c3 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -74,11 +74,9 @@ struct wm8962_priv { struct regulator_bulk_data supplies[WM8962_NUM_SUPPLIES]; struct notifier_block disable_nb[WM8962_NUM_SUPPLIES]; -#if IS_ENABLED(CONFIG_INPUT) struct input_dev *beep; struct work_struct beep_work; int beep_rate; -#endif #ifdef CONFIG_GPIOLIB struct gpio_chip gpio_chip; @@ -3145,7 +3143,6 @@ int wm8962_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack) } EXPORT_SYMBOL_GPL(wm8962_mic_detect); -#if IS_ENABLED(CONFIG_INPUT) static int beep_rates[] = { 500, 1000, 2000, 4000, }; @@ -3277,15 +3274,6 @@ static void wm8962_free_beep(struct snd_soc_codec *codec) snd_soc_update_bits(codec, WM8962_BEEP_GENERATOR_1, WM8962_BEEP_ENA,0); } -#else -static void wm8962_init_beep(struct snd_soc_codec *codec) -{ -} - -static void wm8962_free_beep(struct snd_soc_codec *codec) -{ -} -#endif static void wm8962_set_gpio_mode(struct wm8962_priv *wm8962, int gpio) {