From patchwork Sat Jan 19 16:33:04 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: 2006861 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 E3B6B3FE1F for ; Sat, 19 Jan 2013 16:33:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751621Ab3ASQdo (ORCPT ); Sat, 19 Jan 2013 11:33:44 -0500 Received: from mail-qa0-f46.google.com ([209.85.216.46]:61872 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751508Ab3ASQdn (ORCPT ); Sat, 19 Jan 2013 11:33:43 -0500 Received: by mail-qa0-f46.google.com with SMTP id r4so5932806qaq.5 for ; Sat, 19 Jan 2013 08:33:42 -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=qqlFQT/Y2aWuHzgkhkMIKHZ1EzspJOAijTGz92Q4ggQ=; b=kUnS3U6G29QqkEBVwc/o5klKKV6kKjnFlrCMnQjMTkYzigkej1E/LJ4dAwI1Rdg3VI HDspTTFUpgiNGAkdKTCUFksEflT17Zot2q4ImWk+TYEh9Bvz8KukbEEfGCdvVR9soksO VBdiiDhxEvxhjGdWimD5Okq6taIymm4eQ/a/6/uPc31wbIF62cxdbFc/4Ux7M+UjApr3 WvUswYdm8ujy/VkXlgK0NdmjKPvTrV46je4wVY17Zv5bYATaECjFzNlaQRcPrproQKhs iImDumKg+YLAnIJe99n2r4xYjUfyT6KFvVaf8mRMrdGhzSgLTgcFUkRUnT8HgHNko0FA rHTw== X-Received: by 10.224.86.136 with SMTP id s8mr13913038qal.72.1358613222087; Sat, 19 Jan 2013 08:33:42 -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.33.39 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 08:33:41 -0800 (PST) From: Peter Senna Tschudin To: mchehab@redhat.com Cc: hans.verkuil@cisco.com, jrnieder@gmail.com, peter.senna@gmail.com, emilgoode@gmail.com, linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 01/24] use IS_ENABLED() macro Date: Sat, 19 Jan 2013 14:33:04 -0200 Message-Id: <1358613206-4274-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_VIDEO_CX88_DVB) || \ defined(CONFIG_VIDEO_CX88_DVB_MODULE) with: #if IS_ENABLED(CONFIG_VIDEO_CX88_DVB) This change was made for: CONFIG_VIDEO_CX88_DVB, CONFIG_VIDEO_CX88_BLACKBIRD, CONFIG_VIDEO_CX88_VP3054 Reported-by: Mauro Carvalho Chehab Signed-off-by: Peter Senna Tschudin --- drivers/media/pci/cx88/cx88.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h index ba0dba4..feff53c 100644 --- a/drivers/media/pci/cx88/cx88.h +++ b/drivers/media/pci/cx88/cx88.h @@ -363,7 +363,7 @@ struct cx88_core { unsigned int tuner_formats; /* config info -- dvb */ -#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE) +#if IS_ENABLED(CONFIG_VIDEO_CX88_DVB) int (*prev_set_voltage)(struct dvb_frontend *fe, fe_sec_voltage_t voltage); #endif void (*gate_ctrl)(struct cx88_core *core, int open); @@ -562,8 +562,7 @@ struct cx8802_dev { /* for blackbird only */ struct list_head devlist; -#if defined(CONFIG_VIDEO_CX88_BLACKBIRD) || \ - defined(CONFIG_VIDEO_CX88_BLACKBIRD_MODULE) +#if IS_ENABLED(CONFIG_VIDEO_CX88_BLACKBIRD) struct video_device *mpeg_dev; u32 mailbox; int width; @@ -574,13 +573,12 @@ struct cx8802_dev { struct cx2341x_handler cxhdl; #endif -#if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE) +#if IS_ENABLED(CONFIG_VIDEO_CX88_DVB) /* for dvb only */ struct videobuf_dvb_frontends frontends; #endif -#if defined(CONFIG_VIDEO_CX88_VP3054) || \ - defined(CONFIG_VIDEO_CX88_VP3054_MODULE) +#if IS_ENABLED(CONFIG_VIDEO_CX88_VP3054) /* For VP3045 secondary I2C bus support */ struct vp3054_i2c_state *vp3054; #endif