git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[pandora-kernel.git]
/
arch
/
mips
/
kernel
/
i8259.c
diff --git
a/arch/mips/kernel/i8259.c
b/arch/mips/kernel/i8259.c
index
e221662
..
5c74eb7
100644
(file)
--- a/
arch/mips/kernel/i8259.c
+++ b/
arch/mips/kernel/i8259.c
@@
-14,7
+14,7
@@
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/spinlock.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/spinlock.h>
-#include <linux/sys
dev
.h>
+#include <linux/sys
core_ops
.h>
#include <linux/irq.h>
#include <asm/i8259.h>
#include <linux/irq.h>
#include <asm/i8259.h>
@@
-110,7
+110,7
@@
int i8259A_irq_pending(unsigned int irq)
void make_8259A_irq(unsigned int irq)
{
disable_irq_nosync(irq);
void make_8259A_irq(unsigned int irq)
{
disable_irq_nosync(irq);
-
set_irq
_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
+
irq_set
_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
enable_irq(irq);
}
enable_irq(irq);
}
@@
-215,14
+215,13
@@
spurious_8259A_irq:
}
}
}
}
-static
int i8259A_resume(struct sys_device *dev
)
+static
void i8259A_resume(void
)
{
if (i8259A_auto_eoi >= 0)
init_8259A(i8259A_auto_eoi);
{
if (i8259A_auto_eoi >= 0)
init_8259A(i8259A_auto_eoi);
- return 0;
}
}
-static
int i8259A_shutdown(struct sys_device *dev
)
+static
void i8259A_shutdown(void
)
{
/* Put the i8259A into a quiescent state that
* the kernel initialization code can get it
{
/* Put the i8259A into a quiescent state that
* the kernel initialization code can get it
@@
-232,26
+231,17
@@
static int i8259A_shutdown(struct sys_device *dev)
outb(0xff, PIC_MASTER_IMR); /* mask all of 8259A-1 */
outb(0xff, PIC_SLAVE_IMR); /* mask all of 8259A-1 */
}
outb(0xff, PIC_MASTER_IMR); /* mask all of 8259A-1 */
outb(0xff, PIC_SLAVE_IMR); /* mask all of 8259A-1 */
}
- return 0;
}
}
-static struct sysdev_class i8259_sysdev_class = {
- .name = "i8259",
+static struct syscore_ops i8259_syscore_ops = {
.resume = i8259A_resume,
.shutdown = i8259A_shutdown,
};
.resume = i8259A_resume,
.shutdown = i8259A_shutdown,
};
-static struct sys_device device_i8259A = {
- .id = 0,
- .cls = &i8259_sysdev_class,
-};
-
static int __init i8259A_init_sysfs(void)
{
static int __init i8259A_init_sysfs(void)
{
- int error = sysdev_class_register(&i8259_sysdev_class);
- if (!error)
- error = sysdev_register(&device_i8259A);
- return error;
+ register_syscore_ops(&i8259_syscore_ops);
+ return 0;
}
device_initcall(i8259A_init_sysfs);
}
device_initcall(i8259A_init_sysfs);
@@
-336,8
+326,8
@@
void __init init_i8259_irqs(void)
init_8259A(0);
for (i = I8259A_IRQ_BASE; i < I8259A_IRQ_BASE + 16; i++) {
init_8259A(0);
for (i = I8259A_IRQ_BASE; i < I8259A_IRQ_BASE + 16; i++) {
-
set_irq
_chip_and_handler(i, &i8259A_chip, handle_level_irq);
-
set_irq
_probe(i);
+
irq_set
_chip_and_handler(i, &i8259A_chip, handle_level_irq);
+
irq_set
_probe(i);
}
setup_irq(I8259A_IRQ_BASE + PIC_CASCADE_IR, &irq2);
}
setup_irq(I8259A_IRQ_BASE + PIC_CASCADE_IR, &irq2);