From patchwork Sat Jan 19 16:33:18 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: 2006991 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 120A13FE1F for ; Sat, 19 Jan 2013 16:34:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752004Ab3ASQej (ORCPT ); Sat, 19 Jan 2013 11:34:39 -0500 Received: from mail-qa0-f46.google.com ([209.85.216.46]:57070 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751989Ab3ASQei (ORCPT ); Sat, 19 Jan 2013 11:34:38 -0500 Received: by mail-qa0-f46.google.com with SMTP id r4so5933081qaq.5 for ; Sat, 19 Jan 2013 08:34:37 -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=upL3xcE30odTltaMqTtoaXCafqW3b/D9JhNC/m9Cu5Q=; b=WS07hkeAyZ79QC3XnUAC9mX3eOAzjaYhBhevG51l2XBpHi+UNlUYdF7tZqa8uYz7EC pUk3cEU6jbKGxknTdCmQu8WAL1wq6UQ3WnNkjzud5AWijFzMvUsc8ngxz5ELiEX2xfQE bK0KxS118hLzf+DAZgTLxCgnFtgvPQA2/aC73zMmLPnjin90/PXPX4SYObO9zMeQkVhG iYVxjSeyTZlF+w9zAZH+E2DHY90cyzd/vhRbn8LpHXDOEfQpB28ae638qp/Hkpc0I4am l5UbyV+C1LUSjKETiEjnrSDi7ZfTTMqSKrewRx7vNXd1x3BkWMXSGC72lW+rbKGmJiM3 3RgA== X-Received: by 10.49.16.9 with SMTP id b9mr15337921qed.16.1358613277477; Sat, 19 Jan 2013 08:34:37 -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.35 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 08:34:37 -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 16/24] use IS_ENABLED() macro Date: Sat, 19 Jan 2013 14:33:18 -0200 Message-Id: <1358613206-4274-15-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/sonixj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/gspca/sonixj.c b/drivers/media/usb/gspca/sonixj.c index 36307a9..671d0c6 100644 --- a/drivers/media/usb/gspca/sonixj.c +++ b/drivers/media/usb/gspca/sonixj.c @@ -3077,7 +3077,7 @@ static int sd_querymenu(struct gspca_dev *gspca_dev, return -EINVAL; } -#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 */ @@ -3109,7 +3109,7 @@ static const struct sd_desc sd_desc = { .pkt_scan = sd_pkt_scan, .dq_callback = do_autogain, .querymenu = sd_querymenu, -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) .int_pkt_scan = sd_int_pkt_scan, #endif };