From patchwork Sat Jan 19 23:41:25 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: 2007611 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 F0D7DDF2A2 for ; Sat, 19 Jan 2013 23:42:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752334Ab3ASXmt (ORCPT ); Sat, 19 Jan 2013 18:42:49 -0500 Received: from mail-qa0-f51.google.com ([209.85.216.51]:38409 "EHLO mail-qa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752323Ab3ASXmr (ORCPT ); Sat, 19 Jan 2013 18:42:47 -0500 Received: by mail-qa0-f51.google.com with SMTP id i20so3880319qad.17 for ; Sat, 19 Jan 2013 15:42:47 -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=mEBDGcvlGS9xNDHx4fgNN2YmsCZUIl9E8fuOsIsoCKw=; b=BZG0V3rS48J1y4gxxFhIgXyU6Q/QyRdRf6yGUx6IezKvUcvUeFUTsyomVef62G+1ZS cxk6ZQ1YWgsIFKZg6gQoIPcoxJaGJ5FHfpCRjC2Wca/vKkI5goUO7VszYQuHOqXEJBlc wyp1MsOsFSOSNoue4BcPEP2ek/ikzG9kEsKOOrNW3Qd8DQA05w2si0JrDOi1Svjbixd/ koG/zSsSoHTYSUbYCNOEFAgdvu8Na4cRZtFh0RXupV2qv/LDGwOe/pa/0eKTciwObOEv VPPm2LnBiOAakhH7OtLOvPp36cdLG9GvF0qU6z1sWKxNaQmGGrkKsLnTruBqN93M5wqL Coag== X-Received: by 10.49.104.108 with SMTP id gd12mr16309405qeb.37.1358638967093; Sat, 19 Jan 2013 15:42:47 -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.44 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 15:42:46 -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 V2 18/24] usb/gspca/stv06xx/stv06xx.c: use IS_ENABLED() macro Date: Sat, 19 Jan 2013 21:41:25 -0200 Message-Id: <1358638891-4775-19-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/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 };