From patchwork Sat Jan 19 16:33:07 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: 2006891 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 BDDCB3FE1F for ; Sat, 19 Jan 2013 16:34:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751903Ab3ASQeB (ORCPT ); Sat, 19 Jan 2013 11:34:01 -0500 Received: from mail-qc0-f172.google.com ([209.85.216.172]:63541 "EHLO mail-qc0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751737Ab3ASQeA (ORCPT ); Sat, 19 Jan 2013 11:34:00 -0500 Received: by mail-qc0-f172.google.com with SMTP id b25so1491141qca.31 for ; Sat, 19 Jan 2013 08:33:59 -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=cwWyyUv0+N6inf8BeapDCHXyWvvCuR+ySk77Wkc2NyY=; b=IX4oTgkE8vVjLZoNhCovFjF3MUOxLn55br2UQZRZkt/PqDrT0YRg9fzp+F8kTPpVgZ ftK19zepDzP+GZQlWiEdB+6fqViY5LUyPr8DOHSjbG1BDxwnqADbrEWvrmbbTd0kbAp4 D/34J3FFpPl/9ACGlnzaRsx4KLlVM4yoWQsqLynYqHD6fsBEhQPs84kIOF5a6YJcwFpF sUR3DhQiKS8WZlagBuUGKuvZYMmajJm6DDPOcRL4DnKqihApLS2MZxlfL8leIdsle8Fr +BwHdX6X7DgtNJIoRTdXnhKEKfStb+yTbfef5dOjh6zjMKs8OL2cq1Ej/+j6ZHbdZrky TVWg== X-Received: by 10.49.128.37 with SMTP id nl5mr15625306qeb.59.1358613239448; Sat, 19 Jan 2013 08:33:59 -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.52 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 19 Jan 2013 08:33:58 -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 04/24] use IS_ENABLED() macro Date: Sat, 19 Jan 2013 14:33:07 -0200 Message-Id: <1358613206-4274-4-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_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 Acked-by: Jonathan Corbet --- 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