From patchwork Thu Sep 30 02:41:03 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: kyle mcmartin <kyle@mcmartin.ca>
X-Patchwork-Id: 218462
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8U2faSG000473
	for <patchwork-parisc@patchwork.kernel.org>;
	Thu, 30 Sep 2010 02:41:36 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752794Ab0I3ClL (ORCPT
	<rfc822;patchwork-parisc@patchwork.kernel.org>);
	Wed, 29 Sep 2010 22:41:11 -0400
Received: from bombadil.infradead.org ([18.85.46.34]:54221 "EHLO
	bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752452Ab0I3ClK (ORCPT
	<rfc822;linux-parisc@vger.kernel.org>);
	Wed, 29 Sep 2010 22:41:10 -0400
Received: from kyle by bombadil.infradead.org with local (Exim 4.72 #1 (Red
	Hat Linux)) id 1P194x-0002Da-Dw; Thu, 30 Sep 2010 02:41:03 +0000
Date: Wed, 29 Sep 2010 22:41:03 -0400
From: Kyle McMartin <kyle@mcmartin.ca>
To: Kyle McMartin <kyle@mcmartin.ca>
Cc: Thomas Gleixner <tglx@linutronix.de>, LKML <linux-kernel@vger.kernel.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Andrew Morton <akpm@linux-foundation.org>, Ingo Molnar <mingo@elte.hu>,
	Peter Zijlstra <peterz@infradead.org>,
	Christoph Hellwig <hch@infradead.org>, linux-alpha@vger.kernel.org,
	linux-cris-kernel@axis.com, Haavard Skinnemoen <hskinnemoen@atmel.com>,
	Tony Luck <tony.luck@intel.com>, linux-ia64@vger.kernel.org,
	Yoshinori Sato <ysato@users.sourceforge.jp>,
	Hirokazu Takata <takata@linux-m32r.org>,
	Greg Ungerer <gerg@uclinux.org>, Jeff Dike <jdike@addtoit.com>,
	linux-parisc@vger.kernel.org, Chris Zankel <chris@zankel.net>,
	linux-arch@vger.kernel.org
Subject: Re: [RFC trollpatch 1/1] genirq: Remove the fits all and nothing
	__do_IRQ() code
Message-ID: <20100930024103.GB2604@bombadil.infradead.org>
References: <20100908152036.643594727@linutronix.de>
	<20100930012641.GA2604@bombadil.infradead.org>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <20100930012641.GA2604@bombadil.infradead.org>
User-Agent: Mutt/1.5.20 (2009-08-17)
Sender: linux-parisc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-parisc.vger.kernel.org>
X-Mailing-List: linux-parisc@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Thu, 30 Sep 2010 02:41:36 +0000 (UTC)


diff --git a/arch/h8300/kernel/irq.c b/arch/h8300/kernel/irq.c
index c25dc2c..acdbc07 100644
--- a/arch/h8300/kernel/irq.c
+++ b/arch/h8300/kernel/irq.c
@@ -50,10 +50,6 @@ static void h8300_disable_irq(unsigned int irq)
 		IER_REGS &= ~(1 << (irq - EXT_IRQ0));
 }
 
-static void h8300_end_irq(unsigned int irq)
-{
-}
-
 static unsigned int h8300_startup_irq(unsigned int irq)
 {
 	if (is_ext_irq(irq))
@@ -75,10 +71,9 @@ struct irq_chip h8300irq_chip = {
 	.name		= "H8300-INTC",
 	.startup	= h8300_startup_irq,
 	.shutdown	= h8300_shutdown_irq,
-	.enable		= h8300_enable_irq,
+	.unmask		= h8300_enable_irq,
+	.mask		= h8300_disable_irq,
 	.disable	= h8300_disable_irq,
-	.ack		= NULL,
-	.end		= h8300_end_irq,
 };
 
 #if defined(CONFIG_RAMKERNEL)
@@ -161,17 +156,14 @@ void __init init_IRQ(void)
 	setup_vector();
 
 	for (c = 0; c < NR_IRQS; c++) {
-		irq_desc[c].status = IRQ_DISABLED;
-		irq_desc[c].action = NULL;
-		irq_desc[c].depth = 1;
-		irq_desc[c].chip = &h8300irq_chip;
+		set_irq_chip_and_handler(c, &h8300_irq_chip, handle_edge_irq);
 	}
 }
 
 asmlinkage void do_IRQ(int irq)
 {
 	irq_enter();
-	__do_IRQ(irq);
+	generic_handle_irq(irq);
 	irq_exit();
 }