From patchwork Sat Jan 19 16:41:26 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: 2007101 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 3F6D8DF2A2 for ; Sat, 19 Jan 2013 16:41:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751968Ab3ASQlp (ORCPT ); Sat, 19 Jan 2013 11:41:45 -0500 Received: from mail-qa0-f51.google.com ([209.85.216.51]:46869 "EHLO mail-qa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751906Ab3ASQlo (ORCPT ); Sat, 19 Jan 2013 11:41:44 -0500 Received: by mail-qa0-f51.google.com with SMTP id i20so3759549qad.3 for ; Sat, 19 Jan 2013 08:41: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; bh=453Mh9v1OjNyea83xZ84UWS1gEFRpj0xBRQ9v/uMWK4=; b=mPzuDSqLG8v3d1gYE8raxQwHyu6n7DJVnM0xFrnjDDFoWmEDlmAMUR6YaIU3p06sUo b3tji7VychHLfYwn0pXvb5JPyveRhS4PaDEc2jU4KCsCZtlRLjpx1IzqqKke4djKLmjC 2KOrrnMJiCm+Z/qUjMxZJoeuv9seLwsOr79gjLm0nKqSPUYU/bQGe+VNrVjJ1hsUv7SX ImV7z6f87iwMnWYZBv/lMXZgd9fWuHegdUUutRjkW0QmAqPjKHppbYg47zBsBLnzJpOp lq7ZARbR7pq2tdIt/J2EdEE32iKPPNKLVCwvB9Vsg43O2fmjFddhHVwoIoem4k8SSbPR i+dQ== X-Received: by 10.224.177.72 with SMTP id bh8mr13695558qab.49.1358613703193; Sat, 19 Jan 2013 08:41: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 f7sm5422669qap.13.2013.01.19.08.41.38 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 08:41: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 15/24] use IS_ENABLED() macro Date: Sat, 19 Jan 2013 14:41:26 -0200 Message-Id: <1358613686-4468-1-git-send-email-peter.senna@gmail.com> X-Mailer: git-send-email 1.7.11.7 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 Also replaced: with: Reported-by: Mauro Carvalho Chehab Signed-off-by: Peter Senna Tschudin --- drivers/media/usb/gspca/sonixb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/gspca/sonixb.c b/drivers/media/usb/gspca/sonixb.c index 1220340..104ae25 100644 --- a/drivers/media/usb/gspca/sonixb.c +++ b/drivers/media/usb/gspca/sonixb.c @@ -1400,7 +1400,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 */ @@ -1430,7 +1430,7 @@ static const struct sd_desc sd_desc = { .pkt_scan = sd_pkt_scan, .querymenu = sd_querymenu, .dq_callback = do_autogain, -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) .int_pkt_scan = sd_int_pkt_scan, #endif }; @@ -1448,7 +1448,7 @@ static const struct usb_device_id device_table[] = { {USB_DEVICE(0x0c45, 0x600d), SB(PAS106, 101)}, {USB_DEVICE(0x0c45, 0x6011), SB(OV6650, 101)}, {USB_DEVICE(0x0c45, 0x6019), SB(OV7630, 101)}, -#if !defined CONFIG_USB_SN9C102 && !defined CONFIG_USB_SN9C102_MODULE +#if !IS_ENABLED(CONFIG_USB_SN9C102) {USB_DEVICE(0x0c45, 0x6024), SB(TAS5130CXX, 102)}, {USB_DEVICE(0x0c45, 0x6025), SB(TAS5130CXX, 102)}, #endif