Linux PARISC architecture development
 help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: linux-parisc@vger.kernel.org
Cc: Kyle McMartin <kyle@redhat.com>,
	"James E.J. Bottomley" <jejb@parisc-linux.org>
Subject: [patch 3/8] parisc: Convert eisa irq_chip to new functions
Date: Sun, 06 Feb 2011 20:45:56 -0000	[thread overview]
Message-ID: <20110206204510.631074663@linutronix.de> (raw)
In-Reply-To: 20110206204411.109238550@linutronix.de

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 drivers/parisc/eisa.c |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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)



  parent reply	other threads:[~2011-02-06 20:45 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-06 20:45 [patch 0/8] parisc: Convert to new irq_chip functions Thomas Gleixner
2011-02-06 20:45 ` [patch 1/8] parisc: Convert cpu irq_chip to new functions Thomas Gleixner
2011-02-06 20:45 ` [patch 2/8] parisc: Convert dino " Thomas Gleixner
2011-02-06 20:45 ` Thomas Gleixner [this message]
2011-02-06 20:45 ` [patch 4/8] parisc: Convert gsc " Thomas Gleixner
2011-02-06 20:46 ` [patch 5/8] parisc: Convert iosapic " Thomas Gleixner
2011-02-06 20:46 ` [patch 6/8] parisc: Convert superio " Thomas Gleixner
2011-02-06 20:46 ` [patch 7/8] parisc: Prepare show_interrupts for GENERIC_HARDIRQS_NO_DEPRECATED Thomas Gleixner
2011-02-06 20:46 ` [patch 8/8] parisc: Select GENERIC_HARDIRQS_NO_DEPRECATED Thomas Gleixner
2011-02-07 16:02 ` [patch 0/8] parisc: Convert to new irq_chip functions James Bottomley
2011-02-07 16:53   ` Thomas Gleixner
2011-02-07 17:36     ` James Bottomley
2011-02-07 18:28       ` Thomas Gleixner
2011-02-07 21:26         ` James Bottomley
2011-02-08  0:32           ` James Bottomley
2011-02-08 14:25             ` Thomas Gleixner
2011-02-08 14:37               ` Thomas Gleixner
2011-02-08 16:53                 ` James Bottomley
2011-02-08 17:42                   ` Thomas Gleixner
2011-02-08 17:45                     ` James Bottomley
2011-02-08 21:59                       ` Thomas Gleixner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110206204510.631074663@linutronix.de \
    --to=tglx@linutronix.de \
    --cc=jejb@parisc-linux.org \
    --cc=kyle@redhat.com \
    --cc=linux-parisc@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox