From patchwork Sat Jan 19 16:33:21 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: 2007021 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 06B2B3FE1F for ; Sat, 19 Jan 2013 16:34:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752024Ab3ASQes (ORCPT ); Sat, 19 Jan 2013 11:34:48 -0500 Received: from mail-qc0-f171.google.com ([209.85.216.171]:57717 "EHLO mail-qc0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751989Ab3ASQer (ORCPT ); Sat, 19 Jan 2013 11:34:47 -0500 Received: by mail-qc0-f171.google.com with SMTP id d1so806779qca.16 for ; Sat, 19 Jan 2013 08:34:46 -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=vOwhWLLLS9oeinFXl8YPZTt5k2Y28f2o1XQCqwU54mE=; b=wuvpzsSdN2dtr7RmlvBUSWIfADuaUEnaMoI1E2N74Y/ep/2rhVIZsP08uB6vtSh4X3 SUaFDgjtyWvcTAxw7BlY5LXlhzJ+UBBR/qLeXsmB7gYQJZ1vbR/WSfapTfCyrj38pTcu ZBJ+Pnl7kaqs0MA0kel4GXPyWFslt2KWmL+mLX3pM0tFDRk1nkogRADS883mL/L/7DSA B5IExGQfngPs1Ex9z5WeonVnv4lMBBosgNAyWGNYqVK/TKAo7VeVVesvB5nxVtiyfYKT IbewNOrNSw3DP4XCpX0CQTwf3BPjuZE7CPfS97QlcKHv8NaI9jcptMVVbinKoyhqr7g/ zYbA== X-Received: by 10.49.74.198 with SMTP id w6mr15215350qev.57.1358613286272; Sat, 19 Jan 2013 08:34:46 -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.43 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 08:34:45 -0800 (PST) From: Peter Senna Tschudin To: lcostantino@gmail.com Cc: hdegoede@redhat.com, mchehab@redhat.com, linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org, Peter Senna Tschudin Subject: [PATCH 19/24] use IS_ENABLED() macro Date: Sat, 19 Jan 2013 14:33:21 -0200 Message-Id: <1358613206-4274-18-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/t613.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/gspca/t613.c b/drivers/media/usb/gspca/t613.c index b92d4ef..e2cc4e5 100644 --- a/drivers/media/usb/gspca/t613.c +++ b/drivers/media/usb/gspca/t613.c @@ -823,7 +823,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev) msleep(20); reg_w(gspca_dev, 0x0309); } -#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->button_pressed) { input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0); @@ -841,7 +841,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, int pkt_type; if (data[0] == 0x5a) { -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) if (len > 20) { u8 state = (data[20] & 0x80) ? 1 : 0; if (sd->button_pressed != state) { @@ -1019,7 +1019,7 @@ static const struct sd_desc sd_desc = { .start = sd_start, .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 };