From patchwork Sat Jan 19 16:33:12 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: 2006941 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 6E8053FE1F for ; Sat, 19 Jan 2013 16:34:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751952Ab3ASQeX (ORCPT ); Sat, 19 Jan 2013 11:34:23 -0500 Received: from mail-qc0-f182.google.com ([209.85.216.182]:64691 "EHLO mail-qc0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751921Ab3ASQeV (ORCPT ); Sat, 19 Jan 2013 11:34:21 -0500 Received: by mail-qc0-f182.google.com with SMTP id k19so3057485qcs.13 for ; Sat, 19 Jan 2013 08:34:21 -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=ouAui09gPuCivihIpLPNJ8/XELRgz8v00MfKSEUcxKs=; b=UmSfoGu2+VB0ZuLwvYGcQBeeX90I0eWSXf29TYGq4nLLmqIlXWeuw3UFa1XJ9166oM lTaNuOXlMAM7Qgd+4BpRChIMoSIghoAXis5g9W16SQ6BPvyEqHGPUPRBeVk5QUAxJbef JTOA0licPvqKL6dHy0ozgXuz6x3H3/DsB8jGWV247/Nh9rsgA73FN1V/CddAx0HDUDOF RaCyI4jHnVeXTTyRr73SfmpGWeTu90y1qC316sw0HTOIWuY6rPXi1bIH9saiyxxjunGo z/n22rxY/rut2Thvb48RTemN94nAdJ+3y7LWQq+QJ8HQlfyuPoWLlpRSTUBMi931VKPF AjMw== X-Received: by 10.229.178.101 with SMTP id bl37mr3147875qcb.131.1358613260965; Sat, 19 Jan 2013 08:34:20 -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.14 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 08:34:20 -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 09/24] use IS_ENABLED() macro Date: Sat, 19 Jan 2013 14:33:12 -0200 Message-Id: <1358613206-4274-9-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/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 };