lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MIPS: TXx9: Convert core to new irq_chip functions

Browse Source 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2192/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Thomas Gleixner
2011-03-23 21:09:02 +00:00
committed by Ralf Baechle
parent a93951c459
commit 0e9c4ec61a
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
arch/mips/kernel/irq_txx9.c
View File

@@ -63,9 +63,9 @@ static struct {
unsigned char mode; unsigned char mode;
} txx9irq[TXx9_MAX_IR] __read_mostly; } txx9irq[TXx9_MAX_IR] __read_mostly;
static void txx9_irq_unmask(unsigned int irq) static void txx9_irq_unmask(struct irq_data *d)
{ {
unsigned int irq_nr = irq - TXX9_IRQ_BASE; unsigned int irq_nr = d->irq - TXX9_IRQ_BASE;
u32 __iomem *ilrp = &txx9_ircptr->ilr[(irq_nr % 16 ) / 2]; u32 __iomem *ilrp = &txx9_ircptr->ilr[(irq_nr % 16 ) / 2];
int ofs = irq_nr / 16 * 16 + (irq_nr & 1) * 8; int ofs = irq_nr / 16 * 16 + (irq_nr & 1) * 8;
@@ -79,9 +79,9 @@ static void txx9_irq_unmask(unsigned int irq)
#endif #endif
} }
static inline void txx9_irq_mask(unsigned int irq) static inline void txx9_irq_mask(struct irq_data *d)
{ {
unsigned int irq_nr = irq - TXX9_IRQ_BASE; unsigned int irq_nr = d->irq - TXX9_IRQ_BASE;
u32 __iomem *ilrp = &txx9_ircptr->ilr[(irq_nr % 16) / 2]; u32 __iomem *ilrp = &txx9_ircptr->ilr[(irq_nr % 16) / 2];
int ofs = irq_nr / 16 * 16 + (irq_nr & 1) * 8; int ofs = irq_nr / 16 * 16 + (irq_nr & 1) * 8;
@@ -99,19 +99,19 @@ static inline void txx9_irq_mask(unsigned int irq)
#endif #endif
} }
static void txx9_irq_mask_ack(unsigned int irq) static void txx9_irq_mask_ack(struct irq_data *d)
{ {
unsigned int irq_nr = irq - TXX9_IRQ_BASE; unsigned int irq_nr = d->irq - TXX9_IRQ_BASE;
txx9_irq_mask(irq); txx9_irq_mask(d);
/* clear edge detection */ /* clear edge detection */
if (unlikely(TXx9_IRCR_EDGE(txx9irq[irq_nr].mode))) if (unlikely(TXx9_IRCR_EDGE(txx9irq[irq_nr].mode)))
__raw_writel(TXx9_IRSCR_EIClrE | irq_nr, &txx9_ircptr->scr); __raw_writel(TXx9_IRSCR_EIClrE | irq_nr, &txx9_ircptr->scr);
} }
static int txx9_irq_set_type(unsigned int irq, unsigned int flow_type) static int txx9_irq_set_type(struct irq_data *d, unsigned int flow_type)
{ {
unsigned int irq_nr = irq - TXX9_IRQ_BASE; unsigned int irq_nr = d->irq - TXX9_IRQ_BASE;
u32 cr; u32 cr;
u32 __iomem *crp; u32 __iomem *crp;
int ofs; int ofs;
@@ -139,11 +139,11 @@ static int txx9_irq_set_type(unsigned int irq, unsigned int flow_type)
static struct irq_chip txx9_irq_chip = { static struct irq_chip txx9_irq_chip = {
.name = "TXX9", .name = "TXX9",
.ack = txx9_irq_mask_ack, .irq_ack = txx9_irq_mask_ack,
.mask = txx9_irq_mask, .irq_mask = txx9_irq_mask,
.mask_ack = txx9_irq_mask_ack, .irq_mask_ack = txx9_irq_mask_ack,
.unmask = txx9_irq_unmask, .irq_unmask = txx9_irq_unmask,
.set_type = txx9_irq_set_type, .irq_set_type = txx9_irq_set_type,
}; };
void __init txx9_irq_init(unsigned long baseaddr) void __init txx9_irq_init(unsigned long baseaddr)