From patchwork Thu Nov 10 00:07:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Moffett X-Patchwork-Id: 124747 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 0B23B1008CD for ; Thu, 10 Nov 2011 11:09:03 +1100 (EST) Received: from border.exmeritus.com (border.exmeritus.com [IPv6:2002:46a7:f11a:ffff::]) by ozlabs.org (Postfix) with ESMTP id 61CEB100EAB for ; Thu, 10 Nov 2011 11:08:26 +1100 (EST) Received: from ysera.exmeritus.com (firewall2.exmeritus.com [10.13.38.2]) by border.exmeritus.com (Postfix) with ESMTP id 859FEAC082; Wed, 9 Nov 2011 19:08:24 -0500 (EST) From: Kyle Moffett To: linuxppc-dev@lists.ozlabs.org Subject: [RFC PATCH 03/17] fsl_rio: Remove FreeScale e500 conditionals Date: Wed, 9 Nov 2011 19:07:01 -0500 Message-Id: <1320883635-17194-4-git-send-email-Kyle.D.Moffett@boeing.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <4E42AB6F.1050900@freescale.com> References: <4E42AB6F.1050900@freescale.com> Cc: Baruch Siach , Shaohui Xie , Alexandre Bounine , Timur Tabi , linux-kernel@vger.kernel.org, Paul Gortmaker , Liu Gang , Paul Mackerras , Kyle Moffett , Scott Wood , Andrew Morton X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org The "CONFIG_E500" conditional should be unnecessary. The fsl_rio hardware is only present on MPC85xx (e500/e500mc) anyways, although it should build everywhere for better compile-test coverage. The conditionally-defined fsl_rio_mcheck_exception() function lost its two e500-specific constants in commit 82a9a4809f: powerpc/e500: fix breakage with fsl_rio_mcheck_exception Specifically, the references to SPRN_MCSR and MCSR_BUS_RBERR were moved to an e500-specific file. This patch just removes the unnecessary #ifdef, as the entire file is effectively dead code on non-e500 platforms anyways. Signed-off-by: Kyle Moffett --- arch/powerpc/sysdev/fsl_rio.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c index de170fd..783e25c 100644 --- a/arch/powerpc/sysdev/fsl_rio.c +++ b/arch/powerpc/sysdev/fsl_rio.c @@ -281,7 +281,6 @@ struct rio_priv { static void __iomem *rio_regs_win; -#ifdef CONFIG_E500 int fsl_rio_mcheck_exception(struct pt_regs *regs) { const struct exception_table_entry *entry; @@ -308,7 +307,6 @@ int fsl_rio_mcheck_exception(struct pt_regs *regs) return 0; } EXPORT_SYMBOL_GPL(fsl_rio_mcheck_exception); -#endif /** * fsl_rio_doorbell_send - Send a MPC85xx doorbell message