From patchwork Mon Dec 2 02:34:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 3263331 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6ED05BEEAD for ; Mon, 2 Dec 2013 02:34:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 96BC9202FF for ; Mon, 2 Dec 2013 02:34:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B3DD7202F8 for ; Mon, 2 Dec 2013 02:34:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752614Ab3LBCei (ORCPT ); Sun, 1 Dec 2013 21:34:38 -0500 Received: from mail-qe0-f51.google.com ([209.85.128.51]:49922 "EHLO mail-qe0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752630Ab3LBCeh (ORCPT ); Sun, 1 Dec 2013 21:34:37 -0500 Received: by mail-qe0-f51.google.com with SMTP id 1so10335193qee.38 for ; Sun, 01 Dec 2013 18:34:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=/1GQaMSWpOMREpLFprBKYaxv00NJ6EjHkp0zLdza5is=; b=BiEj0+9FVAU/yWLFARbxLMnTA/2ULulTQ5YCu4AfzLjTWudTEbj9GXhnQDOeOyYxnu 29aPVRo+afZcArwUZTX4pvOg5IoUHu8EiAiAVeqAE7VfwR4VremfV7ApQZrYgj/ePzLb 1DianZvWKO+DPA1ZoCbN+VCmIv+JMkA+Fb7N1ZzK9FjlwTUq1DUSUUvelSUgKDTsv0pm MsS0aAfzC1kkcoG7eVa2jC/5N92kLKrgtP988+aM7ZRU0wzZbP7u18xIjKQtFMkDtxls jwN89sBi87ejyhlh9AfxKNvRp3jh2dnTpZlyi4/dDVddeyRIZSD80Cr4gIjLkVnqb6yv QQLA== X-Received: by 10.49.36.161 with SMTP id r1mr105542004qej.4.1385951676792; Sun, 01 Dec 2013 18:34:36 -0800 (PST) Received: from localhost.localdomain ([186.207.93.139]) by mx.google.com with ESMTPSA id r5sm202660958qaj.13.2013.12.01.18.34.35 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 01 Dec 2013 18:34:36 -0800 (PST) From: Fabio Estevam To: dmitry.torokhov@gmail.com Cc: linux-input@vger.kernel.org, Fabio Estevam Subject: [PATCH] Input: ads7846 - Use IS_ENABLED() macro Date: Mon, 2 Dec 2013 00:34:11 -0200 Message-Id: <1385951651-19605-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.8.1.2 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Fabio Estevam Using the IS_ENABLED() macro can make the code shorter and simpler Signed-off-by: Fabio Estevam --- drivers/input/touchscreen/ads7846.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index ea19536..5695786 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c @@ -101,7 +101,7 @@ struct ads7846 { struct spi_device *spi; struct regulator *reg; -#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE) +#if IS_ENABLED(CONFIG_HWMON) struct attribute_group *attr_group; struct device *hwmon; #endif @@ -421,7 +421,7 @@ static int ads7845_read12_ser(struct device *dev, unsigned command) return status; } -#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE) +#if IS_ENABLED(CONFIG_HWMON) #define SHOW(name, var, adjust) static ssize_t \ name ## _show(struct device *dev, struct device_attribute *attr, char *buf) \