From patchwork Sun Feb 6 20:45:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 536071 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 p16KkBTP022225 for ; Sun, 6 Feb 2011 20:46:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754020Ab1BFUqO (ORCPT ); Sun, 6 Feb 2011 15:46:14 -0500 Received: from www.tglx.de ([62.245.132.106]:42313 "EHLO www.tglx.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753896Ab1BFUqN (ORCPT ); Sun, 6 Feb 2011 15:46:13 -0500 Received: from localhost6.localdomain6 (www.tglx.de [127.0.0.1]) by www.tglx.de (8.13.8/8.13.8/TGLX-2007100201) with ESMTP id p16KjuT5008182; Sun, 6 Feb 2011 21:45:57 +0100 Message-Id: <20110206204510.631074663@linutronix.de> User-Agent: quilt/0.48-1 Date: Sun, 06 Feb 2011 20:45:56 -0000 From: Thomas Gleixner To: linux-parisc@vger.kernel.org Cc: Kyle McMartin , "James E.J. Bottomley" Subject: [patch 3/8] parisc: Convert eisa irq_chip to new functions References: <20110206204411.109238550@linutronix.de> Content-Disposition: inline; filename=parisc-convert-eisa.patch X-Virus-Scanned: clamav-milter 0.95.3 at www.tglx.de X-Virus-Status: Clean X-Spam-Status: No, score=-1.4 required=5.0 tests=ALL_TRUSTED,AWL autolearn=failed version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on www.tglx.de 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]); Sun, 06 Feb 2011 20:46:14 +0000 (UTC) Index: linux-next/drivers/parisc/eisa.c =================================================================== --- linux-next.orig/drivers/parisc/eisa.c +++ linux-next/drivers/parisc/eisa.c @@ -144,8 +144,9 @@ static unsigned int eisa_irq_level __rea /* called by free irq */ -static void eisa_mask_irq(unsigned int irq) +static void eisa_mask_irq(struct irq_data *d) { + unsigned int irq = d->irq; unsigned long flags; EISA_DBG("disable irq %d\n", irq); @@ -164,8 +165,9 @@ static void eisa_mask_irq(unsigned int i } /* called by request irq */ -static void eisa_unmask_irq(unsigned int irq) +static void eisa_unmask_irq(struct irq_data *d) { + unsigned int irq = d->irq; unsigned long flags; EISA_DBG("enable irq %d\n", irq); @@ -183,9 +185,9 @@ static void eisa_unmask_irq(unsigned int } static struct irq_chip eisa_interrupt_type = { - .name = "EISA", - .unmask = eisa_unmask_irq, - .mask = eisa_mask_irq, + .name = "EISA", + .irq_unmask = eisa_unmask_irq, + .irq_mask = eisa_mask_irq, }; static irqreturn_t eisa_irq(int wax_irq, void *intr_dev)