From patchwork Sat Jan 19 23:41:16 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: 2007521 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 5A03BDF2A2 for ; Sat, 19 Jan 2013 23:42:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752221Ab3ASXm0 (ORCPT ); Sat, 19 Jan 2013 18:42:26 -0500 Received: from mail-qa0-f47.google.com ([209.85.216.47]:57937 "EHLO mail-qa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751304Ab3ASXmX (ORCPT ); Sat, 19 Jan 2013 18:42:23 -0500 Received: by mail-qa0-f47.google.com with SMTP id a19so6053092qad.20 for ; Sat, 19 Jan 2013 15:42:23 -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=sIJhTLLgSiFqD9ZIlurnRV+EeB2zNcDUVwMJX9r1ziw=; b=If/457ZGX6vCxITGOfaCfTENpeVwYCiX1iGaiu+90OrmocpdgF0SQCUBpM25Z1jxH/ LOXkOAziNbjEvaYUfc55dwZetPxvREuXNt3GApTwdsjgaymczGdG7N3e2Zn+mcvNq2Wl cAGabA9A6K7aBOD1EeDI+vomWhS4+nUccQGd5BKqsnN6FqUCeOXGKdAgZNopRAvfAFrC 3eKArSRNYXZDX+RpBGT++8lYu1oCdqzOrmSWB7b1M0+0K1SpJxiQe4XeVP4hKtOCuHLg +NSNKqCjjZt+5tIqGLTcKSW25zPdwA1KrNF4KfyjGX7Z/yYFXeRIZ/QcLUny9NFpGZCD vAyw== X-Received: by 10.224.100.130 with SMTP id y2mr14561816qan.40.1358638942969; Sat, 19 Jan 2013 15:42:22 -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 y1sm6058595qan.22.2013.01.19.15.42.20 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 15:42:22 -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 V2 09/24] usb/gspca/ov519.c: use IS_ENABLED() macro Date: Sat, 19 Jan 2013 21:41:16 -0200 Message-Id: <1358638891-4775-10-git-send-email-peter.senna@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1358638891-4775-1-git-send-email-peter.senna@gmail.com> References: <1358638891-4775-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 --- Changes from V1: Updated subject drivers/media/usb/gspca/ov519.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/gspca/ov519.c b/drivers/media/usb/gspca/ov519.c index 9aa09f8..9ad19a7 100644 --- a/drivers/media/usb/gspca/ov519.c +++ b/drivers/media/usb/gspca/ov519.c @@ -4238,7 +4238,7 @@ static void sd_stop0(struct gspca_dev *gspca_dev) if (sd->bridge == BRIDGE_W9968CF) w9968cf_stop0(sd); -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) /* If the last button state is pressed, release it now! */ if (sd->snapshot_pressed) { input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0); @@ -4255,7 +4255,7 @@ static void ov51x_handle_button(struct gspca_dev *gspca_dev, u8 state) struct sd *sd = (struct sd *) gspca_dev; if (sd->snapshot_pressed != state) { -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) input_report_key(gspca_dev->input_dev, KEY_CAMERA, state); input_sync(gspca_dev->input_dev); #endif @@ -4924,7 +4924,7 @@ static const struct sd_desc sd_desc = { .dq_callback = sd_reset_snapshot, .get_jcomp = sd_get_jcomp, .set_jcomp = sd_set_jcomp, -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) .other_input = 1, #endif };