From patchwork Tue Oct 1 07:26:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 279354 X-Patchwork-Delegate: agust@denx.de 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 183BF2C03E2 for ; Tue, 1 Oct 2013 17:26:48 +1000 (EST) Received: by ozlabs.org (Postfix) id F03AC2C00CE; Tue, 1 Oct 2013 17:26:24 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from pokefinder.org (sauhun.de [89.238.76.85]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9C9692C00AB for ; Tue, 1 Oct 2013 17:26:23 +1000 (EST) Received: from p4fe2569f.dip0.t-ipconnect.de ([79.226.86.159]:34325 helo=localhost) by pokefinder.org with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1VQuLY-0002AO-Di; Tue, 01 Oct 2013 09:26:16 +0200 From: Wolfram Sang To: linuxppc-dev@ozlabs.org Subject: [PATCH] Revert "powerpc: 52xx: provide a default in mpc52xx_irqhost_map()" Date: Tue, 1 Oct 2013 09:26:06 +0200 Message-Id: <1380612366-13504-1-git-send-email-wsa@the-dreams.de> X-Mailer: git-send-email 1.7.10.4 Cc: Sebastian Andrzej Siewior , Anatolij Gustschin , linux-rt-users@vger.kernel.org, Wolfram Sang X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16rc2 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" This reverts commit 6391f697d4892a6f233501beea553e13f7745a23. The compiler warning it wants to fix does not appear with my gcc 4.6.2. IMO we don't need superfluous (and here even misleading) code to make old compilers happy. Fixing the printout was bogus, too. We want to know WHICH critical irq failed, not which level it had. Signed-off-by: Wolfram Sang Cc: Sebastian Andrzej Siewior Cc: Anatolij Gustschin --- Have I been on CC when the original patch was sent? arch/powerpc/platforms/52xx/mpc52xx_pic.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c index b69221b..b89ef65 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c @@ -373,9 +373,8 @@ static int mpc52xx_irqhost_map(struct irq_domain *h, unsigned int virq, case MPC52xx_IRQ_L1_PERP: irqchip = &mpc52xx_periph_irqchip; break; case MPC52xx_IRQ_L1_SDMA: irqchip = &mpc52xx_sdma_irqchip; break; case MPC52xx_IRQ_L1_CRIT: - default: pr_warn("%s: Critical IRQ #%d is unsupported! Nopping it.\n", - __func__, l1irq); + __func__, l2irq); irq_set_chip(virq, &no_irq_chip); return 0; }