LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Greg Ungerer <gerg@uclinux.org>
Subject: [patch 04/10] m68knommu: Convert coldfire intc-simr irq_chip to new functions
Date: Sun, 06 Feb 2011 23:39:21 -0000 [thread overview]
Message-ID: <20110206233904.490845204@linutronix.de> (raw)
In-Reply-To: <20110206233845.480884215@linutronix.de>
[-- Attachment #1: m68k-nommu-convert-coldfire-intc-simr.patch --]
[-- Type: text/plain, Size: 1782 bytes --]
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/m68knommu/platform/coldfire/intc-simr.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
Index: linux-next/arch/m68knommu/platform/coldfire/intc-simr.c
===================================================================
--- linux-next.orig/arch/m68knommu/platform/coldfire/intc-simr.c
+++ linux-next/arch/m68knommu/platform/coldfire/intc-simr.c
@@ -20,8 +20,10 @@
#include <asm/mcfsim.h>
#include <asm/traps.h>
-static void intc_irq_mask(unsigned int irq)
+static void intc_irq_mask(struct irq_data *d)
{
+ unsigned int irq = d->irq;
+
if (irq >= MCFINT_VECBASE) {
if (irq < MCFINT_VECBASE + 64)
__raw_writeb(irq - MCFINT_VECBASE, MCFINTC0_SIMR);
@@ -30,8 +32,10 @@ static void intc_irq_mask(unsigned int i
}
}
-static void intc_irq_unmask(unsigned int irq)
+static void intc_irq_unmask(struct irq_data *d)
{
+ unsigned int irq = d->irq;
+
if (irq >= MCFINT_VECBASE) {
if (irq < MCFINT_VECBASE + 64)
__raw_writeb(irq - MCFINT_VECBASE, MCFINTC0_CIMR);
@@ -40,8 +44,10 @@ static void intc_irq_unmask(unsigned int
}
}
-static int intc_irq_set_type(unsigned int irq, unsigned int type)
+static int intc_irq_set_type(struct irq_data *d, unsigned int type)
{
+ unsigned int irq = d->irq;
+
if (irq >= MCFINT_VECBASE) {
if (irq < MCFINT_VECBASE + 64)
__raw_writeb(5, MCFINTC0_ICR0 + irq - MCFINT_VECBASE);
@@ -53,9 +59,9 @@ static int intc_irq_set_type(unsigned in
static struct irq_chip intc_irq_chip = {
.name = "CF-INTC",
- .mask = intc_irq_mask,
- .unmask = intc_irq_unmask,
- .set_type = intc_irq_set_type,
+ .irq_mask = intc_irq_mask,
+ .irq_unmask = intc_irq_unmask,
+ .irq_set_type = intc_irq_set_type,
};
void __init init_IRQ(void)
next prev parent reply other threads:[~2011-02-06 23:39 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-06 23:39 [patch 00/10] m68knommu: Convert irq_chips and use proper accessor functions Thomas Gleixner
2011-02-06 23:39 ` [patch 01/10] m68knommu: 5772: Replace private irq flow handler Thomas Gleixner
2011-02-08 4:49 ` Greg Ungerer
2011-02-08 4:52 ` Greg Ungerer
2011-02-06 23:39 ` [patch 02/10] m68knommu Convert coldfire intc irq_chip to new functions Thomas Gleixner
2011-02-06 23:39 ` [patch 03/10] m68knommu: Convert coldfire intc-2 " Thomas Gleixner
2011-02-06 23:39 ` Thomas Gleixner [this message]
2011-02-06 23:39 ` [patch 05/10] m68knommu: Convert 68328 ints " Thomas Gleixner
2011-02-06 23:39 ` [patch 06/10] m68knommu: Convert 68360 " Thomas Gleixner
2011-02-06 23:39 ` [patch 07/10] m68knommu: Convert 5272 intc " Thomas Gleixner
2011-02-08 3:24 ` Greg Ungerer
2011-02-08 9:48 ` Thomas Gleixner
2011-02-08 10:03 ` Greg Ungerer
2011-02-06 23:39 ` [patch 08/10] m68knommu Convert 5249 " Thomas Gleixner
2011-02-06 23:39 ` [patch 09/10] m68knommu: Use proper irq_desc accessors in show_interrupts() Thomas Gleixner
2011-02-06 23:39 ` [patch 10/10] m68knommu: Select GENERIC_HARDIRQS_NO_DEPRECATED 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=20110206233904.490845204@linutronix.de \
--to=tglx@linutronix.de \
--cc=gerg@uclinux.org \
--cc=linux-kernel@vger.kernel.org \
--subject='Re: [patch 04/10] m68knommu: Convert coldfire intc-simr irq_chip to new functions' \
/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
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).