git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...
[sfrench/cifs-2.6.git]
/
arch
/
ppc
/
syslib
/
gt64260_pic.c
diff --git
a/arch/ppc/syslib/gt64260_pic.c
b/arch/ppc/syslib/gt64260_pic.c
index f97b3a9abd1e48137da4cc0a6eeb6a5d7a2a862d..3b4fcca5d1e1dcc29eefc86c6cb970b2f79481d7 100644
(file)
--- a/
arch/ppc/syslib/gt64260_pic.c
+++ b/
arch/ppc/syslib/gt64260_pic.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/syslib/gt64260_pic.c
- *
* Interrupt controller support for Galileo's GT64260.
*
* Author: Chris Zankel <source@mvista.com>
* Interrupt controller support for Galileo's GT64260.
*
* Author: Chris Zankel <source@mvista.com>
@@
-37,7
+35,6
@@
#include <linux/interrupt.h>
#include <linux/sched.h>
#include <linux/signal.h>
#include <linux/interrupt.h>
#include <linux/sched.h>
#include <linux/signal.h>
-#include <linux/stddef.h>
#include <linux/delay.h>
#include <linux/irq.h>
#include <linux/delay.h>
#include <linux/irq.h>
@@
-100,7
+97,7
@@
gt64260_init_irq(void)
/* use the gt64260 for all (possible) interrupt sources */
for (i = gt64260_irq_base; i < (gt64260_irq_base + 96); i++)
/* use the gt64260 for all (possible) interrupt sources */
for (i = gt64260_irq_base; i < (gt64260_irq_base + 96); i++)
- irq_desc[i].
handler
= >64260_pic;
+ irq_desc[i].
chip
= >64260_pic;
if (ppc_md.progress)
ppc_md.progress("gt64260_init_irq: exit", 0x0);
if (ppc_md.progress)
ppc_md.progress("gt64260_init_irq: exit", 0x0);
@@
-112,9
+109,6
@@
gt64260_init_irq(void)
* This function returns the lowest interrupt number of all interrupts that
* are currently asserted.
*
* This function returns the lowest interrupt number of all interrupts that
* are currently asserted.
*
- * Input Variable(s):
- * struct pt_regs* not used
- *
* Output Variable(s):
* None.
*
* Output Variable(s):
* None.
*
@@
-122,7
+116,7
@@
gt64260_init_irq(void)
* int <interrupt number> or -2 (bogus interrupt)
*/
int
* int <interrupt number> or -2 (bogus interrupt)
*/
int
-gt64260_get_irq(
struct pt_regs *regs
)
+gt64260_get_irq(
void
)
{
int irq;
int irq_gpp;
{
int irq;
int irq_gpp;
@@
-231,7
+225,7
@@
gt64260_mask_irq(unsigned int irq)
}
static irqreturn_t
}
static irqreturn_t
-gt64260_cpu_error_int_handler(int irq, void *dev_id
, struct pt_regs *regs
)
+gt64260_cpu_error_int_handler(int irq, void *dev_id)
{
printk(KERN_ERR "gt64260_cpu_error_int_handler: %s 0x%08x\n",
"Error on CPU interface - Cause regiser",
{
printk(KERN_ERR "gt64260_cpu_error_int_handler: %s 0x%08x\n",
"Error on CPU interface - Cause regiser",
@@
-252,7
+246,7
@@
gt64260_cpu_error_int_handler(int irq, void *dev_id, struct pt_regs *regs)
}
static irqreturn_t
}
static irqreturn_t
-gt64260_pci_error_int_handler(int irq, void *dev_id
, struct pt_regs *regs
)
+gt64260_pci_error_int_handler(int irq, void *dev_id)
{
u32 val;
unsigned int pci_bus = (unsigned int)dev_id;
{
u32 val;
unsigned int pci_bus = (unsigned int)dev_id;
@@
-299,7
+293,7
@@
gt64260_register_hdlrs(void)
/* Register CPU interface error interrupt handler */
if ((rc = request_irq(MV64x60_IRQ_CPU_ERR,
/* Register CPU interface error interrupt handler */
if ((rc = request_irq(MV64x60_IRQ_CPU_ERR,
- gt64260_cpu_error_int_handler,
SA_INTERRUPT
, CPU_INTR_STR, 0)))
+ gt64260_cpu_error_int_handler,
IRQF_DISABLED
, CPU_INTR_STR, 0)))
printk(KERN_WARNING "Can't register cpu error handler: %d", rc);
mv64x60_write(&bh, MV64x60_CPU_ERR_MASK, 0);
printk(KERN_WARNING "Can't register cpu error handler: %d", rc);
mv64x60_write(&bh, MV64x60_CPU_ERR_MASK, 0);
@@
-307,7
+301,7
@@
gt64260_register_hdlrs(void)
/* Register PCI 0 error interrupt handler */
if ((rc = request_irq(MV64360_IRQ_PCI0, gt64260_pci_error_int_handler,
/* Register PCI 0 error interrupt handler */
if ((rc = request_irq(MV64360_IRQ_PCI0, gt64260_pci_error_int_handler,
-
SA_INTERRUPT
, PCI0_INTR_STR, (void *)0)))
+
IRQF_DISABLED
, PCI0_INTR_STR, (void *)0)))
printk(KERN_WARNING "Can't register pci 0 error handler: %d",
rc);
printk(KERN_WARNING "Can't register pci 0 error handler: %d",
rc);
@@
-316,7
+310,7
@@
gt64260_register_hdlrs(void)
/* Register PCI 1 error interrupt handler */
if ((rc = request_irq(MV64360_IRQ_PCI1, gt64260_pci_error_int_handler,
/* Register PCI 1 error interrupt handler */
if ((rc = request_irq(MV64360_IRQ_PCI1, gt64260_pci_error_int_handler,
-
SA_INTERRUPT
, PCI1_INTR_STR, (void *)1)))
+
IRQF_DISABLED
, PCI1_INTR_STR, (void *)1)))
printk(KERN_WARNING "Can't register pci 1 error handler: %d",
rc);
printk(KERN_WARNING "Can't register pci 1 error handler: %d",
rc);