From patchwork Fri Mar 25 13:40:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 662241 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 p2PDefoD019060 for ; Fri, 25 Mar 2011 13:40:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752673Ab1CYNkV (ORCPT ); Fri, 25 Mar 2011 09:40:21 -0400 Received: from www.linutronix.de ([62.245.132.108]:38508 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753136Ab1CYNkT (ORCPT ); Fri, 25 Mar 2011 09:40:19 -0400 Received: from localhost ([127.0.0.1] helo=localhost6.localdomain6) by Galois.linutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Q37FQ-0004FU-Kw; Fri, 25 Mar 2011 14:40:17 +0100 Message-Id: <20110325133952.979442989@linutronix.de> User-Agent: quilt/0.48-1 Date: Fri, 25 Mar 2011 13:40:16 -0000 From: Thomas Gleixner To: "James E.J. Bottomley" Cc: Kyle McMartin , linux-parisc@vger.kernel.org Subject: [patch 2/2] parisc: Convert irq namespace References: <20110325133845.830304772@linutronix.de> Content-Disposition: inline; filename=parisc-namespace.patch X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1 Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 25 Mar 2011 13:40:41 +0000 (UTC) Index: linux-2.6-tip/arch/parisc/kernel/irq.c =================================================================== --- linux-2.6-tip.orig/arch/parisc/kernel/irq.c +++ linux-2.6-tip/arch/parisc/kernel/irq.c @@ -235,13 +235,13 @@ int cpu_claim_irq(unsigned int irq, stru { if (irq_desc[irq].action) return -EBUSY; - if (get_irq_chip(irq) != &cpu_interrupt_type) + if (irq_get_chip(irq) != &cpu_interrupt_type) return -EBUSY; /* for iosapic interrupts */ if (type) { - set_irq_chip_and_handler(irq, type, handle_percpu_irq); - set_irq_chip_data(irq, data); + irq_set_chip_and_handler(irq, type, handle_percpu_irq); + irq_set_chip_data(irq, data); __cpu_unmask_irq(irq); } return 0; @@ -393,14 +393,14 @@ static void claim_cpu_irqs(void) { int i; for (i = CPU_IRQ_BASE; i <= CPU_IRQ_MAX; i++) { - set_irq_chip_and_handler(i, &cpu_interrupt_type, + irq_set_chip_and_handler(i, &cpu_interrupt_type, handle_percpu_irq); } - set_irq_handler(TIMER_IRQ, handle_percpu_irq); + irq_set_handler(TIMER_IRQ, handle_percpu_irq); setup_irq(TIMER_IRQ, &timer_action); #ifdef CONFIG_SMP - set_irq_handler(IPI_IRQ, handle_percpu_irq); + irq_set_handler(IPI_IRQ, handle_percpu_irq); setup_irq(IPI_IRQ, &ipi_action); #endif } Index: linux-2.6-tip/drivers/parisc/eisa.c =================================================================== --- linux-2.6-tip.orig/drivers/parisc/eisa.c +++ linux-2.6-tip/drivers/parisc/eisa.c @@ -340,7 +340,7 @@ static int __init eisa_probe(struct pari /* Reserve IRQ2 */ setup_irq(2, &irq2_action); for (i = 0; i < 16; i++) { - set_irq_chip_and_handler(i, &eisa_interrupt_type, + irq_set_chip_and_handler(i, &eisa_interrupt_type, handle_simple_irq); } Index: linux-2.6-tip/drivers/parisc/gsc.c =================================================================== --- linux-2.6-tip.orig/drivers/parisc/gsc.c +++ linux-2.6-tip/drivers/parisc/gsc.c @@ -152,8 +152,8 @@ int gsc_assign_irq(struct irq_chip *type if (irq > GSC_IRQ_MAX) return NO_IRQ; - set_irq_chip_and_handler(irq, type, handle_simple_irq); - set_irq_chip_data(irq, data); + irq_set_chip_and_handler(irq, type, handle_simple_irq); + irq_set_chip_data(irq, data); return irq++; } Index: linux-2.6-tip/drivers/parisc/superio.c =================================================================== --- linux-2.6-tip.orig/drivers/parisc/superio.c +++ linux-2.6-tip/drivers/parisc/superio.c @@ -355,7 +355,8 @@ int superio_fixup_irq(struct pci_dev *pc #endif for (i = 0; i < 16; i++) { - set_irq_chip_and_handler(i, &superio_interrupt_type, handle_simple_irq); + irq_set_chip_and_handler(i, &superio_interrupt_type, + handle_simple_irq); } /*