From patchwork Sat Jan 19 23:41:23 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: 2007581 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 432CC3FE1F for ; Sat, 19 Jan 2013 23:42:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752315Ab3ASXmo (ORCPT ); Sat, 19 Jan 2013 18:42:44 -0500 Received: from mail-qa0-f49.google.com ([209.85.216.49]:57344 "EHLO mail-qa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752279Ab3ASXmm (ORCPT ); Sat, 19 Jan 2013 18:42:42 -0500 Received: by mail-qa0-f49.google.com with SMTP id r4so3882912qaq.15 for ; Sat, 19 Jan 2013 15:42:41 -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=WYbcdz+yCJooOzH2YtK/ABCIhi9WWGgUqowkeZfKNf8=; b=b2U811lu4E6JYWPxhiHhzYeN/qkt2GIjtSbFZlq9E8GoGPdJ8AF/NDm41ULjI80ufu p905ulPWi3nIbyTQxNpu6sysaPGGQCm/5hCfocQkl8iqc+eE/zwk7yFiAvF9+LO5EWgU uKv3VcmhRkc+w+D9cRrT9W5JeEe9L0UwBOOI3KLTo21za0IOOhVJBAv/LXBxSjUD5vMv Qz5yFe6uhXyBkhBuDsL3V2bL8MrfGQsiUOSonWjRiPFW+aCwNLObpxx0IFCmaq0pWfDK vmQSHv3uSZgRiVaI2J1I3JWq3aRYi4VTfLdTf46owF9JamSlG93ISmRIe+T72iDjXY23 tuhA== X-Received: by 10.224.30.203 with SMTP id v11mr14825993qac.31.1358638961694; Sat, 19 Jan 2013 15:42:41 -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.39 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 15:42:41 -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 16/24] usb/gspca/sonixj.c: use IS_ENABLED() macro Date: Sat, 19 Jan 2013 21:41:23 -0200 Message-Id: <1358638891-4775-17-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/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 };