From: Thomas Gleixner <tglx@linutronix.de>
To: linux-alpha@vger.kernel.org
Cc: Kyle McMartin <kyle@redhat.com>, Matt Turner <mattst88@gmail.com>
Subject: [patch 09/19] alpha: marvel: Convert irq_chip functions
Date: Sun, 06 Feb 2011 14:32:39 -0000 [thread overview]
Message-ID: <20110206143148.743291534@linutronix.de> (raw)
In-Reply-To: 20110206143037.124533892@linutronix.de
[-- Attachment #1: alpha-marvel-convert.patch --]
[-- Type: text/plain, Size: 2871 bytes --]
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/alpha/kernel/sys_marvel.c | 42 ++++++++++++++++++-----------------------
1 file changed, 19 insertions(+), 23 deletions(-)
Index: linux-next/arch/alpha/kernel/sys_marvel.c
===================================================================
--- linux-next.orig/arch/alpha/kernel/sys_marvel.c
+++ linux-next/arch/alpha/kernel/sys_marvel.c
@@ -104,9 +104,10 @@ io7_get_irq_ctl(unsigned int irq, struct
}
static void
-io7_enable_irq(unsigned int irq)
+io7_enable_irq(struct irq_data *d)
{
volatile unsigned long *ctl;
+ unsigned int irq = d->irq;
struct io7 *io7;
ctl = io7_get_irq_ctl(irq, &io7);
@@ -115,7 +116,7 @@ io7_enable_irq(unsigned int irq)
__func__, irq);
return;
}
-
+
spin_lock(&io7->irq_lock);
*ctl |= 1UL << 24;
mb();
@@ -124,9 +125,10 @@ io7_enable_irq(unsigned int irq)
}
static void
-io7_disable_irq(unsigned int irq)
+io7_disable_irq(struct irq_data *d)
{
volatile unsigned long *ctl;
+ unsigned int irq = d->irq;
struct io7 *io7;
ctl = io7_get_irq_ctl(irq, &io7);
@@ -135,7 +137,7 @@ io7_disable_irq(unsigned int irq)
__func__, irq);
return;
}
-
+
spin_lock(&io7->irq_lock);
*ctl &= ~(1UL << 24);
mb();
@@ -144,35 +146,29 @@ io7_disable_irq(unsigned int irq)
}
static void
-marvel_irq_noop(unsigned int irq)
-{
- return;
-}
-
-static unsigned int
-marvel_irq_noop_return(unsigned int irq)
-{
- return 0;
+marvel_irq_noop(struct irq_data *d)
+{
+ return;
}
static struct irq_chip marvel_legacy_irq_type = {
.name = "LEGACY",
- .mask = marvel_irq_noop,
- .unmask = marvel_irq_noop,
+ .irq_mask = marvel_irq_noop,
+ .irq_unmask = marvel_irq_noop,
};
static struct irq_chip io7_lsi_irq_type = {
.name = "LSI",
- .unmask = io7_enable_irq,
- .mask = io7_disable_irq,
- .mask_ack = io7_disable_irq,
+ .irq_unmask = io7_enable_irq,
+ .irq_mask = io7_disable_irq,
+ .irq_mask_ack = io7_disable_irq,
};
static struct irq_chip io7_msi_irq_type = {
.name = "MSI",
- .unmask = io7_enable_irq,
- .mask = io7_disable_irq,
- .ack = marvel_irq_noop,
+ .irq_unmask = io7_enable_irq,
+ .irq_mask = io7_disable_irq,
+ .irq_ack = marvel_irq_noop,
};
static void
@@ -280,8 +276,8 @@ init_io7_irqs(struct io7 *io7,
/* Set up the lsi irqs. */
for (i = 0; i < 128; ++i) {
- irq_to_desc(base + i)->status |= IRQ_LEVEL;
set_irq_chip_and_handler(base + i, lsi_ops, handle_level_irq);
+ irq_set_status_flags(i, IRQ_LEVEL);
}
/* Disable the implemented irqs in hardware. */
@@ -294,8 +290,8 @@ init_io7_irqs(struct io7 *io7,
/* Set up the msi irqs. */
for (i = 128; i < (128 + 512); ++i) {
- irq_to_desc(base + i)->status |= IRQ_LEVEL;
set_irq_chip_and_handler(base + i, msi_ops, handle_level_irq);
+ irq_set_status_flags(i, IRQ_LEVEL);
}
for (i = 0; i < 16; ++i)
next prev parent reply other threads:[~2011-02-06 14:32 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-06 14:32 [patch 00/19] Bugfix and irq_chip conversion Thomas Gleixner
2011-02-06 14:32 ` [patch 01/19] alpha: Fix broken SMP=y Thomas Gleixner
2011-02-06 14:32 ` [patch 02/19] alpha: Pyxis convert irq_chip functions Thomas Gleixner
2011-02-06 14:32 ` [patch 03/19] alpha: srm: Convert " Thomas Gleixner
2011-02-06 14:32 ` [patch 04/19] alpha: i8259, alcor, jensen wildfire: Convert irq_chip Thomas Gleixner
2011-02-06 14:32 ` [patch 05/19] alpha: cabriolet: Convert irq_chip functions Thomas Gleixner
2011-02-06 14:32 ` [patch 06/19] alpha: dp264: " Thomas Gleixner
2011-02-06 14:32 ` [patch 07/19] alpha: eb64p: " Thomas Gleixner
2011-02-06 14:32 ` [patch 08/19] alpha: eiger: " Thomas Gleixner
2011-02-06 14:32 ` Thomas Gleixner [this message]
2011-02-06 14:32 ` [patch 10/19] alpha: mikasa: " Thomas Gleixner
2011-02-06 14:32 ` [patch 11/19] alpha: rawhide: " Thomas Gleixner
2011-02-06 14:32 ` [patch 12/19] alpha: noritake: " Thomas Gleixner
2011-02-06 14:32 ` [patch 13/19] alpha: rx164: " Thomas Gleixner
2011-02-06 14:32 ` [patch 14/19] alpha: sable: " Thomas Gleixner
2011-02-06 14:32 ` [patch 15/19] alpha: takara: " Thomas Gleixner
2011-02-06 14:32 ` [patch 16/19] alpha: titan: " Thomas Gleixner
2011-02-23 21:30 ` Matt Turner
2011-02-23 22:03 ` Thomas Gleixner
2011-02-06 14:32 ` [patch 17/19] alpha: irq: Remove pointless irq status manipulation Thomas Gleixner
2011-02-06 14:33 ` [patch 18/19] alpha: irq: Convert affinity to use irq_data Thomas Gleixner
2011-02-06 14:33 ` [patch 19/19] alpha: Enable GENERIC_HARDIRQS_NO_DEPRECATED Thomas Gleixner
2011-02-23 21:17 ` [patch 00/19] Bugfix and irq_chip conversion Matt Turner
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=20110206143148.743291534@linutronix.de \
--to=tglx@linutronix.de \
--cc=kyle@redhat.com \
--cc=linux-alpha@vger.kernel.org \
--cc=mattst88@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).