From patchwork Sat Jan 19 23:41:11 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: 2007471 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 B1D6FDF2A2 for ; Sat, 19 Jan 2013 23:42:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751976Ab3ASXmH (ORCPT ); Sat, 19 Jan 2013 18:42:07 -0500 Received: from mail-qc0-f169.google.com ([209.85.216.169]:48921 "EHLO mail-qc0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751508Ab3ASXmD (ORCPT ); Sat, 19 Jan 2013 18:42:03 -0500 Received: by mail-qc0-f169.google.com with SMTP id t2so3191436qcq.28 for ; Sat, 19 Jan 2013 15:42:02 -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=63ZG6FsNx0bh7+tiHSF6NdR0i8MZB8KGZxzzpbe3h3U=; b=dtAk9sxy/dyF2ZE4/DDrgxXoowgy5GrecOmNeTnmiAKf8LbzcvqtQ4ny7pv7960HlF W0uLHJL94RKqPHv/SgfaWtyj5CdtP1UmP5RUs6fDvSqSEfFA3cjE1zj/Heqir2wFL13S gNBroCg56oN6kF1EzTKbqGUSMk0Q9gPZkRODiwgiok9OwMucQe7hJUSqAVYQNpw7Drdu o6kpohjzKpbu9M3RtfqMi+DVqEKjS0vm8JwODQdzXk0MnOsDQGXnw0mwA7ylI08qODro qcst03oMN6iLr+RgHma0+xrVf4WYTrWE1pTHs6G3dcZCtyHFgXYmnTfIx1451vumwGgq eKTw== X-Received: by 10.224.30.203 with SMTP id v11mr14824815qac.31.1358638922670; Sat, 19 Jan 2013 15:42:02 -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.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 15:42:02 -0800 (PST) From: Peter Senna Tschudin To: corbet@lwn.net Cc: mchehab@redhat.com, linux-media@vger.kernel.org, kernel-janitors@vger.kernel.org, Peter Senna Tschudin Subject: [PATCH V2 04/24] platform/marvell-ccic/mcam-core.h: use IS_ENABLED() macro Date: Sat, 19 Jan 2013 21:41:11 -0200 Message-Id: <1358638891-4775-5-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_VIDEOBUF2_VMALLOC) || \ defined(CONFIG_VIDEOBUF2_VMALLOC_MODULE) with: #if IS_ENABLED(CONFIG_VIDEOBUF2_VMALLOC) This change was made for: CONFIG_VIDEOBUF2_VMALLOC, CONFIG_VIDEOBUF2_DMA_CONTIG, CONFIG_VIDEOBUF2_DMA_SG Reported-by: Mauro Carvalho Chehab Signed-off-by: Peter Senna Tschudin --- Changes from V1: Updated subject drivers/media/platform/marvell-ccic/mcam-core.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/marvell-ccic/mcam-core.h b/drivers/media/platform/marvell-ccic/mcam-core.h index 5e802c6..6c53ac9 100644 --- a/drivers/media/platform/marvell-ccic/mcam-core.h +++ b/drivers/media/platform/marvell-ccic/mcam-core.h @@ -15,15 +15,15 @@ * Create our own symbols for the supported buffer modes, but, for now, * base them entirely on which videobuf2 options have been selected. */ -#if defined(CONFIG_VIDEOBUF2_VMALLOC) || defined(CONFIG_VIDEOBUF2_VMALLOC_MODULE) +#if IS_ENABLED(CONFIG_VIDEOBUF2_VMALLOC) #define MCAM_MODE_VMALLOC 1 #endif -#if defined(CONFIG_VIDEOBUF2_DMA_CONTIG) || defined(CONFIG_VIDEOBUF2_DMA_CONTIG_MODULE) +#if IS_ENABLED(CONFIG_VIDEOBUF2_DMA_CONTIG) #define MCAM_MODE_DMA_CONTIG 1 #endif -#if defined(CONFIG_VIDEOBUF2_DMA_SG) || defined(CONFIG_VIDEOBUF2_DMA_SG_MODULE) +#if IS_ENABLED(CONFIG_VIDEOBUF2_DMA_SG) #define MCAM_MODE_DMA_SG 1 #endif