From patchwork Sat Jan 19 23:41:15 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: 2007511 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 27AD4DF2A2 for ; Sat, 19 Jan 2013 23:42:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752186Ab3ASXmX (ORCPT ); Sat, 19 Jan 2013 18:42:23 -0500 Received: from mail-qa0-f48.google.com ([209.85.216.48]:47299 "EHLO mail-qa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751304Ab3ASXmV (ORCPT ); Sat, 19 Jan 2013 18:42:21 -0500 Received: by mail-qa0-f48.google.com with SMTP id l8so3882244qaq.14 for ; Sat, 19 Jan 2013 15:42:20 -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=HUudchWQbxNYxGu2MRDUHThvr/NntGOPMS94FmnZHzs=; b=zj34AodQFH4MEqAq9/D29Wjn/P2l1h/m/OKLypMMDCcVxgoDicVGwl0MnadwjeupHS vph8TQltyUjmfhXX4RV2bu9AwjmxfZ0vL+fSdvygZUNCyRCUNTl9p80z77oSDPkGNaUV gzyt+gERZkAFdIhwIfkN56KI54aAs5i2TDSxiyjgMjAB6CfZL66geSq8Vx+QqSjowyOA NkWtIKKT0I9Ce8whrreexl/1DDQSkyW10H/fWBw2xSwqFOITZmN1uHSQm6lx7VM2NW9i oyYzr+nQsejUhnbEl/VudmHUIplZmiyzn2IxDC/mlb5j0sFZ+xTayWQH8Z3+AZY3L64b 9zOw== X-Received: by 10.229.111.220 with SMTP id t28mr3448982qcp.146.1358638940365; Sat, 19 Jan 2013 15:42: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 y1sm6058595qan.22.2013.01.19.15.42.17 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 15:42:19 -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 08/24] usb/gspca/konica.c: use IS_ENABLED() macro Date: Sat, 19 Jan 2013 21:41:15 -0200 Message-Id: <1358638891-4775-9-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/konica.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/gspca/konica.c b/drivers/media/usb/gspca/konica.c index bbf91e0..61e25db 100644 --- a/drivers/media/usb/gspca/konica.c +++ b/drivers/media/usb/gspca/konica.c @@ -246,7 +246,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev) struct sd *sd = (struct sd *) gspca_dev; konica_stream_off(gspca_dev); -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) /* Don't keep the button in the pressed state "forever" if it was pressed when streaming is stopped */ if (sd->snapshot_pressed) { @@ -345,7 +345,7 @@ static void sd_isoc_irq(struct urb *urb) gspca_frame_add(gspca_dev, LAST_PACKET, NULL, 0); gspca_frame_add(gspca_dev, FIRST_PACKET, NULL, 0); } else { -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) u8 button_state = st & 0x40 ? 1 : 0; if (sd->snapshot_pressed != button_state) { input_report_key(gspca_dev->input_dev, @@ -452,7 +452,7 @@ static const struct sd_desc sd_desc = { .init_controls = sd_init_controls, .start = sd_start, .stopN = sd_stopN, -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) .other_input = 1, #endif };