From patchwork Sat Jan 19 16:33:20 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: 2007011 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 975AADF2A2 for ; Sat, 19 Jan 2013 16:34:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752019Ab3ASQeq (ORCPT ); Sat, 19 Jan 2013 11:34:46 -0500 Received: from mail-qa0-f48.google.com ([209.85.216.48]:39874 "EHLO mail-qa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751989Ab3ASQen (ORCPT ); Sat, 19 Jan 2013 11:34:43 -0500 Received: by mail-qa0-f48.google.com with SMTP id l8so3733534qaq.7 for ; Sat, 19 Jan 2013 08:34:43 -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=o+ZWohGZ2+cC5+F6VM2qW7GmATX17UIarsYtNvc2OgQ=; b=hTNmD/A0v6H5Rk1PjSNWvnqhgt3NLGp966kB0YocAmFiyid6E35tGOwYZciFXyS9c0 NmUdvrEOf5u0Kqa/fXSErw3O96VcZHQJ9JnjR6hvgIv9lWW8ORqxuoTJVtiGpLjt7kLY FA9b2Zv9+Je7tfb9XDFzznZzVeMER0MZD2LFEnoz1ys9Y2ObfoM6mX76+7YZmF3VfLEx 3yaM+r2zCoxtqXQg1yziMkhxDoFITwi/m8Oat9DQl16sWXABj3+8/9xCphkF9ix8+BLI M/oYzYI4G61F0f477loAVZqa3YPGY4kLda42Nxtq1xmWYxJJZtljCyKzQ7x3Zc30I2EO yEXg== X-Received: by 10.224.86.136 with SMTP id s8mr13915911qal.72.1358613283066; Sat, 19 Jan 2013 08:34:43 -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.40 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 08:34:42 -0800 (PST) From: Peter Senna Tschudin To: hdegoede@redhat.com Cc: mchehab@redhat.com, hans.verkuil@cisco.com, peter.senna@gmail.com, linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 18/24] use IS_ENABLED() macro Date: Sat, 19 Jan 2013 14:33:20 -0200 Message-Id: <1358613206-4274-17-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/stv06xx/stv06xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/gspca/stv06xx/stv06xx.c b/drivers/media/usb/gspca/stv06xx/stv06xx.c index 999ec77..657160b 100644 --- a/drivers/media/usb/gspca/stv06xx/stv06xx.c +++ b/drivers/media/usb/gspca/stv06xx/stv06xx.c @@ -492,7 +492,7 @@ frame_data: } } -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) static int sd_int_pkt_scan(struct gspca_dev *gspca_dev, u8 *data, /* interrupt packet data */ int len) /* interrupt packet length */ @@ -529,7 +529,7 @@ static const struct sd_desc sd_desc = { .pkt_scan = stv06xx_pkt_scan, .isoc_init = stv06xx_isoc_init, .isoc_nego = stv06xx_isoc_nego, -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) .int_pkt_scan = sd_int_pkt_scan, #endif };