From patchwork Sat Jan 19 16:33:16 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: 2007081 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 646A2DF2A2 for ; Sat, 19 Jan 2013 16:35:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751981Ab3ASQef (ORCPT ); Sat, 19 Jan 2013 11:34:35 -0500 Received: from mail-qc0-f169.google.com ([209.85.216.169]:41515 "EHLO mail-qc0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751961Ab3ASQec (ORCPT ); Sat, 19 Jan 2013 11:34:32 -0500 Received: by mail-qc0-f169.google.com with SMTP id t2so3060343qcq.14 for ; Sat, 19 Jan 2013 08:34:31 -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=VlOwQbNu4xnmG8a29OWtABhqpFjpZgqWHWD+gTd7CXE=; b=KO9nvoUWyw6a5QqV35Z60YU75PMI3BtqG8N5hRF9NSXaqq6Inhb7T/kvXOENY8yr/F PepFICaOK+DXTCFfhUZholnT4EzZYE8i35/1XbD9IRKJl0VYQ6NRJ58bk/VT9c8CL/Yo ztJWc7Rxk2/gEjRzw5XBWEEdwBM297iMUpeN5sTPWLwI6oKkhxwPeSW5eqyQKG602r1t B3T1rhuG2HMq3lECzFCr7zQOwg9xegA+dCTbMYpteNxo3y5jWvrVFL6jQNYyZNkye+C+ VQeNLX7cRGrnsIv+q8HfEdF76tPBdxeoSmS7vEZs6mYo2Q8DD/Um3tbUeuPpvZP2yHJi VM3g== X-Received: by 10.49.127.180 with SMTP id nh20mr15760755qeb.19.1358613271606; Sat, 19 Jan 2013 08:34:31 -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.29 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 08:34:31 -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 13/24] use IS_ENABLED() macro Date: Sat, 19 Jan 2013 14:33:16 -0200 Message-Id: <1358613206-4274-13-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/se401.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/gspca/se401.c b/drivers/media/usb/gspca/se401.c index a33cb78..5f729b8 100644 --- a/drivers/media/usb/gspca/se401.c +++ b/drivers/media/usb/gspca/se401.c @@ -594,7 +594,7 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, u8 *data, int len) sd_pkt_scan_janggu(gspca_dev, 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, int len) { struct sd *sd = (struct sd *)gspca_dev; @@ -688,7 +688,7 @@ static const struct sd_desc sd_desc = { .stopN = sd_stopN, .dq_callback = sd_dq_callback, .pkt_scan = sd_pkt_scan, -#if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE) +#if IS_ENABLED(CONFIG_INPUT) .int_pkt_scan = sd_int_pkt_scan, #endif };