From patchwork Wed Sep 12 19:45:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Ramirez Luna X-Patchwork-Id: 1446461 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (unknown [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 3FF513FE79 for ; Wed, 12 Sep 2012 20:03:26 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TBst7-0007YZ-Io; Wed, 12 Sep 2012 19:46:17 +0000 Received: from mail-ob0-f177.google.com ([209.85.214.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TBsst-0007W0-Is for linux-arm-kernel@lists.infradead.org; Wed, 12 Sep 2012 19:46:04 +0000 Received: by obbta17 with SMTP id ta17so3385191obb.36 for ; Wed, 12 Sep 2012 12:46:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=trQd8Rq66CKBdfVLj1zRBQTAQm14ctuh3kW6ZH7r6D8=; b=d1emj6zm5agRCg7OdZGV8EcHiOmzYEV2Ya6ynY/3xv3KJVByq+QDtHlFbC6lRjFiz/ Lxe9zvo+KNCpXLjlg1F+jzGgXeABQoYIIaIDXcO2969dS6Bx39SLdzv+CwGBtlHTvZjY WtLPpXb/m3UVB6rzWvnT1Bhmbf5MASJnLQcoYkBWuBZqhf1JTgueu+Eoxi5D0W5BuD8x hkeGpB4q15TZbBTuG3xOOFCsZOZclzxWyrO1DKG9+oxkG/OzYPKlWgh6WbFbZfC6vjOO 9nG6T+UcBENGLjVpZZW5I8xuw44HOMPntADUQ6Zy1CYIOH/nHQMqezEt3BLyq/XP1pTn Oy8A== Received: by 10.60.31.161 with SMTP id b1mr3789911oei.76.1347479161947; Wed, 12 Sep 2012 12:46:01 -0700 (PDT) Received: from uda0273944.am.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id a6sm17041227oeh.1.2012.09.12.12.46.00 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Sep 2012 12:46:01 -0700 (PDT) From: Omar Ramirez Luna To: Tony Lindgren , Benoit Cousson , Ohad Ben-Cohen , Joerg Roedel Subject: [PATCH v2 1/9] ARM: OMAP: iommu: fix including iommu.h without IOMMU_API selected Date: Wed, 12 Sep 2012 14:45:44 -0500 Message-Id: <1347479152-588-2-git-send-email-omar.luna@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347479152-588-1-git-send-email-omar.luna@linaro.org> References: <1347479152-588-1-git-send-email-omar.luna@linaro.org> X-Gm-Message-State: ALoCoQlc7m9w2GbmRj5nl/CADSXn790AnGuO3DCYi8SESzpR/NA7Aj8HDOSwpRTOmz0wvE6bskj3 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.177 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Russell King , linux-doc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, Rajendra Nayak , linux-kernel@vger.kernel.org, Peter Ujfalusi , Laurent Pinchart , Omar Ramirez Luna , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org If included without IOMMU_API being selected it will break compilation: arch/arm/plat-omap/include/plat/iommu.h: In function 'dev_to_omap_iommu': arch/arm/plat-omap/include/plat/iommu.h:148: error: 'struct dev_archdata' has no member named 'iommu' This will be seen when hwmod includes iommu.h to get the structure for attributes. Also needed for tidspbridge incremental migration to use iommu code. Cc: Tony Lindgren Signed-off-by: Omar Ramirez Luna Acked-by: Laurent Pinchart --- arch/arm/plat-omap/include/plat/iommu.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/plat-omap/include/plat/iommu.h b/arch/arm/plat-omap/include/plat/iommu.h index 88be3e6..e58d571 100644 --- a/arch/arm/plat-omap/include/plat/iommu.h +++ b/arch/arm/plat-omap/include/plat/iommu.h @@ -126,6 +126,7 @@ struct omap_iommu_arch_data { struct omap_iommu *iommu_dev; }; +#ifdef CONFIG_IOMMU_API /** * dev_to_omap_iommu() - retrieves an omap iommu object from a user device * @dev: iommu client device @@ -136,6 +137,7 @@ static inline struct omap_iommu *dev_to_omap_iommu(struct device *dev) return arch_data->iommu_dev; } +#endif /* IOMMU errors */ #define OMAP_IOMMU_ERR_TLB_MISS (1 << 0)