From patchwork Sat Jan 19 16:33:15 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: 2006971 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 C6C5E3FE1F for ; Sat, 19 Jan 2013 16:34:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751979Ab3ASQec (ORCPT ); Sat, 19 Jan 2013 11:34:32 -0500 Received: from mail-qa0-f51.google.com ([209.85.216.51]:38888 "EHLO mail-qa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751965Ab3ASQe3 (ORCPT ); Sat, 19 Jan 2013 11:34:29 -0500 Received: by mail-qa0-f51.google.com with SMTP id i20so3756906qad.3 for ; Sat, 19 Jan 2013 08:34:29 -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=QKHS/nQdTHWqxyQ/UUr+3xYZ1n3tGHMcddqvD5jVV18=; b=qTYKlJU5/j7O+r6RQAx3fiXhHBrIntIdffBDPWwWZBaOKPqQ8uFsdv9pNVpK/kKO0S S0LT2Lx8ZoZzwsC/Wy0xjZktSXWLTeBWCZu6qKq/qaettnniIqrzD8UWAncue1iaXzQN DPjUerdBabES99MZdqEl8Moi0yzZHez+kKoVcK73066+J88knLzYXk5BmFgqwB5Li29f NhOSoG+WQW2BCSCoOgRAxf/8GQnYVQw1O8ZhWUCD9Hx350+kAfmNfEyiL1byeeUdYYZ/ CANrQSPHKSC9Cmq6OYp5KzwvY2g1MiunuEtZAnMBTxupMXL/YdQJmDUOyjvIkldtXILk 4KWg== X-Received: by 10.224.17.198 with SMTP id t6mr13884138qaa.84.1358613268993; Sat, 19 Jan 2013 08:34:28 -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.26 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 08:34:28 -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 12/24] use IS_ENABLED() macro Date: Sat, 19 Jan 2013 14:33:15 -0200 Message-Id: <1358613206-4274-12-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/pac7311.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/gspca/pac7311.c b/drivers/media/usb/gspca/pac7311.c index ba3558d..a12dfbf 100644 --- a/drivers/media/usb/gspca/pac7311.c +++ b/drivers/media/usb/gspca/pac7311.c @@ -621,7 +621,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, gspca_frame_add(gspca_dev, INTER_PACKET, data, len); } -#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 */ @@ -661,7 +661,7 @@ static const struct sd_desc sd_desc = { .stopN = sd_stopN, .pkt_scan = sd_pkt_scan, .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 };