From patchwork Sat Jan 19 16:33:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Senna Tschudin X-Patchwork-Id: 2007001 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 74CDDDF2A2 for ; Sat, 19 Jan 2013 16:34:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752012Ab3ASQem (ORCPT ); Sat, 19 Jan 2013 11:34:42 -0500 Received: from mail-qc0-f172.google.com ([209.85.216.172]:52205 "EHLO mail-qc0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751989Ab3ASQek (ORCPT ); Sat, 19 Jan 2013 11:34:40 -0500 Received: by mail-qc0-f172.google.com with SMTP id b25so1472097qca.17 for ; Sat, 19 Jan 2013 08:34:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=QHhmjfQJ6e39fYeEPv7JFx1j5B4mzL8l7JsrzKDvi+g=; b=HCytDxvY2JXWAkgnJpid7S9nJei8pwH2N4JzaZagN6ubEe3CCg24TlYZ5FkkqJnCcZ 4nxhiGZnFaIcERnw78n6598DcX2WF2WKX3r3EVzYUMqH0itWQHmEKXOr34F2EiP8Xfi9 UPt8A9XAMjethtsn8SXYjtIiRM2cnUz3wKn63thHRRhrPMRnXO6Oo+igp++tA5PQknKX U4/EktVg62iMjfp6oe1JCtzb53HRUS7ohkGgRI270CSid4vgPbjGPedjmmelVAhsPeVS 0ZricC4w4evYZG31cIZWQzKwYYC43kAR4faSeKYPOHJQb6wnWJLyHwmWK4TU3ewyf0+3 SaSA== X-Received: by 10.224.177.204 with SMTP id bj12mr13936604qab.12.1358613280072; Sat, 19 Jan 2013 08:34:40 -0800 (PST) Received: from ace.home.cabure.org (200-140-13-6.bsace705.dsl.brasiltelecom.net.br. [200.140.13.6]) by mx.google.com with ESMTPS id f7sm5410451qap.13.2013.01.19.08.34.37 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 08:34:39 -0800 (PST) From: Peter Senna Tschudin To: hdegoede@redhat.com Cc: mchehab@redhat.com, linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org, Peter Senna Tschudin Subject: [PATCH 17/24] use IS_ENABLED() macro Date: Sat, 19 Jan 2013 14:33:19 -0200 Message-Id: <1358613206-4274-16-git-send-email-peter.senna@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1358613206-4274-1-git-send-email-peter.senna@gmail.com> References: <1358613206-4274-1-git-send-email-peter.senna@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org replace: #if defined(CONFIG_INPUT) || \ defined(CONFIG_INPUT_MODULE) with: #if IS_ENABLED(CONFIG_INPUT) This change was made for: CONFIG_INPUT Reported-by: Mauro Carvalho Chehab Signed-off-by: Peter Senna Tschudin --- drivers/media/usb/gspca/spca561.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/gspca/spca561.c b/drivers/media/usb/gspca/spca561.c index cfe71dd..d1db3d8 100644 --- a/drivers/media/usb/gspca/spca561.c +++ b/drivers/media/usb/gspca/spca561.c @@ -741,7 +741,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, return; } -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) if (data[0] & 0x20) { input_report_key(gspca_dev->input_dev, KEY_CAMERA, 1); input_sync(gspca_dev->input_dev); @@ -866,7 +866,7 @@ static const struct sd_desc sd_desc_12a = { .start = sd_start_12a, .stopN = sd_stopN, .pkt_scan = sd_pkt_scan, -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) .other_input = 1, #endif }; @@ -879,7 +879,7 @@ static const struct sd_desc sd_desc_72a = { .stopN = sd_stopN, .pkt_scan = sd_pkt_scan, .dq_callback = do_autogain, -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) .other_input = 1, #endif };