projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[powerpc.git]
/
drivers
/
parisc
/
eisa.c
diff --git
a/drivers/parisc/eisa.c
b/drivers/parisc/eisa.c
index
9d3bd15
..
309076b
100644
(file)
--- a/
drivers/parisc/eisa.c
+++ b/
drivers/parisc/eisa.c
@@
-33,7
+33,6
@@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
-#include <linux/sched.h>
#include <linux/spinlock.h>
#include <linux/eisa.h>
#include <linux/spinlock.h>
#include <linux/eisa.h>
@@
-199,7
+198,7
@@
static struct hw_interrupt_type eisa_interrupt_type = {
.end = no_end_irq,
};
.end = no_end_irq,
};
-static irqreturn_t eisa_irq(int wax_irq, void *intr_dev
, struct pt_regs *regs
)
+static irqreturn_t eisa_irq(int wax_irq, void *intr_dev)
{
int irq = gsc_readb(0xfc01f000); /* EISA supports 16 irqs */
unsigned long flags;
{
int irq = gsc_readb(0xfc01f000); /* EISA supports 16 irqs */
unsigned long flags;
@@
-234,7
+233,7
@@
static irqreturn_t eisa_irq(int wax_irq, void *intr_dev, struct pt_regs *regs)
}
spin_unlock_irqrestore(&eisa_irq_lock, flags);
}
spin_unlock_irqrestore(&eisa_irq_lock, flags);
- __do_IRQ(irq
, regs
);
+ __do_IRQ(irq);
spin_lock_irqsave(&eisa_irq_lock, flags);
/* unmask */
spin_lock_irqsave(&eisa_irq_lock, flags);
/* unmask */
@@
-249,7
+248,7
@@
static irqreturn_t eisa_irq(int wax_irq, void *intr_dev, struct pt_regs *regs)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static irqreturn_t dummy_irq2_handler(int _, void *dev
, struct pt_regs *regs
)
+static irqreturn_t dummy_irq2_handler(int _, void *dev)
{
printk(KERN_ALERT "eisa: uhh, irq2?\n");
return IRQ_HANDLED;
{
printk(KERN_ALERT "eisa: uhh, irq2?\n");
return IRQ_HANDLED;
@@
-340,7
+339,7
@@
static int __devinit eisa_probe(struct parisc_device *dev)
}
pcibios_register_hba(&eisa_dev.hba);
}
pcibios_register_hba(&eisa_dev.hba);
- result = request_irq(dev->irq, eisa_irq,
SA_SHIRQ
, "EISA", &eisa_dev);
+ result = request_irq(dev->irq, eisa_irq,
IRQF_SHARED
, "EISA", &eisa_dev);
if (result) {
printk(KERN_ERR "EISA: request_irq failed!\n");
return result;
if (result) {
printk(KERN_ERR "EISA: request_irq failed!\n");
return result;
@@
-350,7
+349,7
@@
static int __devinit eisa_probe(struct parisc_device *dev)
irq_desc[2].action = &irq2_action;
for (i = 0; i < 16; i++) {
irq_desc[2].action = &irq2_action;
for (i = 0; i < 16; i++) {
- irq_desc[i].
handler
= &eisa_interrupt_type;
+ irq_desc[i].
chip
= &eisa_interrupt_type;
}
EISA_bus = 1;
}
EISA_bus = 1;