projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../linux-2.6-watchdog-mm
[linux-drm-fsl-dcu.git]
/
arch
/
mips
/
tx4927
/
common
/
tx4927_irq.c
diff --git
a/arch/mips/tx4927/common/tx4927_irq.c
b/arch/mips/tx4927/common/tx4927_irq.c
index 8ca68015cf40ffd9456a17febfa107187eb8b18d..8266a88a3f8881ac6eeb90b6793a2ab7c3927a72 100644
(file)
--- a/
arch/mips/tx4927/common/tx4927_irq.c
+++ b/
arch/mips/tx4927/common/tx4927_irq.c
@@
-23,7
+23,6
@@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/config.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/kernel_stat.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/kernel_stat.h>
@@
-147,7
+146,7
@@
static DEFINE_SPINLOCK(tx4927_cp0_lock);
static DEFINE_SPINLOCK(tx4927_pic_lock);
#define TX4927_CP0_NAME "TX4927-CP0"
static DEFINE_SPINLOCK(tx4927_pic_lock);
#define TX4927_CP0_NAME "TX4927-CP0"
-static struct
hw_interrupt_type
tx4927_irq_cp0_type = {
+static struct
irq_chip
tx4927_irq_cp0_type = {
.typename = TX4927_CP0_NAME,
.startup = tx4927_irq_cp0_startup,
.shutdown = tx4927_irq_cp0_shutdown,
.typename = TX4927_CP0_NAME,
.startup = tx4927_irq_cp0_startup,
.shutdown = tx4927_irq_cp0_shutdown,
@@
-159,7
+158,7
@@
static struct hw_interrupt_type tx4927_irq_cp0_type = {
};
#define TX4927_PIC_NAME "TX4927-PIC"
};
#define TX4927_PIC_NAME "TX4927-PIC"
-static struct
hw_interrupt_type
tx4927_irq_pic_type = {
+static struct
irq_chip
tx4927_irq_pic_type = {
.typename = TX4927_PIC_NAME,
.startup = tx4927_irq_pic_startup,
.shutdown = tx4927_irq_pic_shutdown,
.typename = TX4927_PIC_NAME,
.startup = tx4927_irq_pic_startup,
.shutdown = tx4927_irq_pic_shutdown,
@@
-227,7
+226,7
@@
static void __init tx4927_irq_cp0_init(void)
irq_desc[i].status = IRQ_DISABLED;
irq_desc[i].action = 0;
irq_desc[i].depth = 1;
irq_desc[i].status = IRQ_DISABLED;
irq_desc[i].action = 0;
irq_desc[i].depth = 1;
- irq_desc[i].
handler
= &tx4927_irq_cp0_type;
+ irq_desc[i].
chip
= &tx4927_irq_cp0_type;
}
return;
}
return;
@@
-435,7
+434,7
@@
static void __init tx4927_irq_pic_init(void)
irq_desc[i].status = IRQ_DISABLED;
irq_desc[i].action = 0;
irq_desc[i].depth = 2;
irq_desc[i].status = IRQ_DISABLED;
irq_desc[i].action = 0;
irq_desc[i].depth = 2;
- irq_desc[i].
handler
= &tx4927_irq_pic_type;
+ irq_desc[i].
chip
= &tx4927_irq_pic_type;
}
setup_irq(TX4927_IRQ_NEST_PIC_ON_CP0, &tx4927_irq_pic_action);
}
setup_irq(TX4927_IRQ_NEST_PIC_ON_CP0, &tx4927_irq_pic_action);
@@
-577,24
+576,24
@@
static int tx4927_irq_nested(void)
return (sw_irq);
}
return (sw_irq);
}
-asmlinkage void plat_irq_dispatch(
struct pt_regs *regs
)
+asmlinkage void plat_irq_dispatch(
void
)
{
unsigned int pending = read_c0_status() & read_c0_cause();
if (pending & STATUSF_IP7) /* cpu timer */
{
unsigned int pending = read_c0_status() & read_c0_cause();
if (pending & STATUSF_IP7) /* cpu timer */
- do_IRQ(TX4927_IRQ_CPU_TIMER
, regs
);
+ do_IRQ(TX4927_IRQ_CPU_TIMER);
else if (pending & STATUSF_IP2) { /* tx4927 pic */
unsigned int irq = tx4927_irq_nested();
if (unlikely(irq == 0)) {
else if (pending & STATUSF_IP2) { /* tx4927 pic */
unsigned int irq = tx4927_irq_nested();
if (unlikely(irq == 0)) {
- spurious_interrupt(
regs
);
+ spurious_interrupt();
return;
}
return;
}
- do_IRQ(irq
, regs
);
+ do_IRQ(irq);
} else if (pending & STATUSF_IP0) /* user line 0 */
} else if (pending & STATUSF_IP0) /* user line 0 */
- do_IRQ(TX4927_IRQ_USER0
, regs
);
+ do_IRQ(TX4927_IRQ_USER0);
else if (pending & STATUSF_IP1) /* user line 1 */
else if (pending & STATUSF_IP1) /* user line 1 */
- do_IRQ(TX4927_IRQ_USER1
, regs
);
+ do_IRQ(TX4927_IRQ_USER1);
else
else
- spurious_interrupt(
regs
);
+ spurious_interrupt();
}
}