提交 39e3eb72 编写于 作者: A Al Viro 提交者: Paul Mackerras

[POWERPC] ARCH=ppc pt_regs fixes

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
上级 8de242e6
...@@ -414,7 +414,7 @@ static void siccuart_event(struct SICC_info *info, int event) ...@@ -414,7 +414,7 @@ static void siccuart_event(struct SICC_info *info, int event)
} }
static void static void
siccuart_rx_chars(struct SICC_info *info, struct pt_regs *regs) siccuart_rx_chars(struct SICC_info *info)
{ {
struct tty_struct *tty = info->tty; struct tty_struct *tty = info->tty;
unsigned int status, ch, rsr, flg, ignored = 0; unsigned int status, ch, rsr, flg, ignored = 0;
...@@ -553,15 +553,15 @@ static void siccuart_tx_chars(struct SICC_info *info) ...@@ -553,15 +553,15 @@ static void siccuart_tx_chars(struct SICC_info *info)
} }
static irqreturn_t siccuart_int_rx(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t siccuart_int_rx(int irq, void *dev_id)
{ {
struct SICC_info *info = dev_id; struct SICC_info *info = dev_id;
siccuart_rx_chars(info, regs); siccuart_rx_chars(info)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static irqreturn_t siccuart_int_tx(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t siccuart_int_tx(int irq, void *dev_id)
{ {
struct SICC_info *info = dev_id; struct SICC_info *info = dev_id;
siccuart_tx_chars(info); siccuart_tx_chars(info);
......
...@@ -122,7 +122,7 @@ struct scc_enet_private { ...@@ -122,7 +122,7 @@ struct scc_enet_private {
static int scc_enet_open(struct net_device *dev); static int scc_enet_open(struct net_device *dev);
static int scc_enet_start_xmit(struct sk_buff *skb, struct net_device *dev); static int scc_enet_start_xmit(struct sk_buff *skb, struct net_device *dev);
static int scc_enet_rx(struct net_device *dev); static int scc_enet_rx(struct net_device *dev);
static irqreturn_t scc_enet_interrupt(int irq, void *dev_id, struct pt_regs *); static irqreturn_t scc_enet_interrupt(int irq, void *dev_id);
static int scc_enet_close(struct net_device *dev); static int scc_enet_close(struct net_device *dev);
static struct net_device_stats *scc_enet_get_stats(struct net_device *dev); static struct net_device_stats *scc_enet_get_stats(struct net_device *dev);
static void set_multicast_list(struct net_device *dev); static void set_multicast_list(struct net_device *dev);
...@@ -273,7 +273,7 @@ scc_enet_timeout(struct net_device *dev) ...@@ -273,7 +273,7 @@ scc_enet_timeout(struct net_device *dev)
* This is called from the CPM handler, not the MPC core interrupt. * This is called from the CPM handler, not the MPC core interrupt.
*/ */
static irqreturn_t static irqreturn_t
scc_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs) scc_enet_interrupt(int irq, void * dev_id)
{ {
struct net_device *dev = dev_id; struct net_device *dev = dev_id;
volatile struct scc_enet_private *cep; volatile struct scc_enet_private *cep;
......
...@@ -140,7 +140,7 @@ typedef struct { ...@@ -140,7 +140,7 @@ typedef struct {
static int fcc_enet_open(struct net_device *dev); static int fcc_enet_open(struct net_device *dev);
static int fcc_enet_start_xmit(struct sk_buff *skb, struct net_device *dev); static int fcc_enet_start_xmit(struct sk_buff *skb, struct net_device *dev);
static int fcc_enet_rx(struct net_device *dev); static int fcc_enet_rx(struct net_device *dev);
static irqreturn_t fcc_enet_interrupt(int irq, void *dev_id, struct pt_regs *); static irqreturn_t fcc_enet_interrupt(int irq, void *dev_id);
static int fcc_enet_close(struct net_device *dev); static int fcc_enet_close(struct net_device *dev);
static struct net_device_stats *fcc_enet_get_stats(struct net_device *dev); static struct net_device_stats *fcc_enet_get_stats(struct net_device *dev);
/* static void set_multicast_list(struct net_device *dev); */ /* static void set_multicast_list(struct net_device *dev); */
...@@ -524,7 +524,7 @@ fcc_enet_timeout(struct net_device *dev) ...@@ -524,7 +524,7 @@ fcc_enet_timeout(struct net_device *dev)
/* The interrupt handler. */ /* The interrupt handler. */
static irqreturn_t static irqreturn_t
fcc_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs) fcc_enet_interrupt(int irq, void * dev_id)
{ {
struct net_device *dev = dev_id; struct net_device *dev = dev_id;
volatile struct fcc_enet_private *cep; volatile struct fcc_enet_private *cep;
...@@ -1563,7 +1563,7 @@ mii_discover_phy(uint mii_reg, struct net_device *dev) ...@@ -1563,7 +1563,7 @@ mii_discover_phy(uint mii_reg, struct net_device *dev)
#ifdef PHY_INTERRUPT #ifdef PHY_INTERRUPT
/* This interrupt occurs when the PHY detects a link change. */ /* This interrupt occurs when the PHY detects a link change. */
static irqreturn_t static irqreturn_t
mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs) mii_link_interrupt(int irq, void * dev_id)
{ {
struct net_device *dev = dev_id; struct net_device *dev = dev_id;
struct fcc_enet_private *fep = dev->priv; struct fcc_enet_private *fep = dev->priv;
......
...@@ -47,12 +47,12 @@ cpm8xx_t *cpmp; /* Pointer to comm processor space */ ...@@ -47,12 +47,12 @@ cpm8xx_t *cpmp; /* Pointer to comm processor space */
/* CPM interrupt vector functions. /* CPM interrupt vector functions.
*/ */
struct cpm_action { struct cpm_action {
void (*handler)(void *, struct pt_regs * regs); void (*handler)(void *);
void *dev_id; void *dev_id;
}; };
static struct cpm_action cpm_vecs[CPMVEC_NR]; static struct cpm_action cpm_vecs[CPMVEC_NR];
static irqreturn_t cpm_interrupt(int irq, void * dev, struct pt_regs * regs); static irqreturn_t cpm_interrupt(int irq, void * dev);
static irqreturn_t cpm_error_interrupt(int irq, void *dev, struct pt_regs * regs); static irqreturn_t cpm_error_interrupt(int irq, void *dev);
static void alloc_host_memory(void); static void alloc_host_memory(void);
/* Define a table of names to identify CPM interrupt handlers in /* Define a table of names to identify CPM interrupt handlers in
* /proc/interrupts. * /proc/interrupts.
...@@ -205,7 +205,7 @@ cpm_interrupt_init(void) ...@@ -205,7 +205,7 @@ cpm_interrupt_init(void)
* Get the CPM interrupt vector. * Get the CPM interrupt vector.
*/ */
int int
cpm_get_irq(struct pt_regs *regs) cpm_get_irq(void)
{ {
int cpm_vec; int cpm_vec;
...@@ -222,7 +222,7 @@ cpm_get_irq(struct pt_regs *regs) ...@@ -222,7 +222,7 @@ cpm_get_irq(struct pt_regs *regs)
/* CPM interrupt controller cascade interrupt. /* CPM interrupt controller cascade interrupt.
*/ */
static irqreturn_t static irqreturn_t
cpm_interrupt(int irq, void * dev, struct pt_regs * regs) cpm_interrupt(int irq, void * dev)
{ {
/* This interrupt handler never actually gets called. It is /* This interrupt handler never actually gets called. It is
* installed only to unmask the CPM cascade interrupt in the SIU * installed only to unmask the CPM cascade interrupt in the SIU
...@@ -237,7 +237,7 @@ cpm_interrupt(int irq, void * dev, struct pt_regs * regs) ...@@ -237,7 +237,7 @@ cpm_interrupt(int irq, void * dev, struct pt_regs * regs)
* tests in the interrupt handler. * tests in the interrupt handler.
*/ */
static irqreturn_t static irqreturn_t
cpm_error_interrupt(int irq, void *dev, struct pt_regs *regs) cpm_error_interrupt(int irq, void *dev)
{ {
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -246,11 +246,11 @@ cpm_error_interrupt(int irq, void *dev, struct pt_regs *regs) ...@@ -246,11 +246,11 @@ cpm_error_interrupt(int irq, void *dev, struct pt_regs *regs)
* request_irq() to the handler prototype required by cpm_install_handler(). * request_irq() to the handler prototype required by cpm_install_handler().
*/ */
static irqreturn_t static irqreturn_t
cpm_handler_helper(int irq, void *dev_id, struct pt_regs *regs) cpm_handler_helper(int irq, void *dev_id)
{ {
int cpm_vec = irq - CPM_IRQ_OFFSET; int cpm_vec = irq - CPM_IRQ_OFFSET;
(*cpm_vecs[cpm_vec].handler)(dev_id, regs); (*cpm_vecs[cpm_vec].handler)(dev_id);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -267,8 +267,7 @@ cpm_handler_helper(int irq, void *dev_id, struct pt_regs *regs) ...@@ -267,8 +267,7 @@ cpm_handler_helper(int irq, void *dev_id, struct pt_regs *regs)
* request_irq() or cpm_install_handler(). * request_irq() or cpm_install_handler().
*/ */
void void
cpm_install_handler(int cpm_vec, void (*handler)(void *, struct pt_regs *regs), cpm_install_handler(int cpm_vec, void (*handler)(void *), void *dev_id)
void *dev_id)
{ {
int err; int err;
......
...@@ -331,7 +331,7 @@ static int CS_SetFormat(int format); ...@@ -331,7 +331,7 @@ static int CS_SetFormat(int format);
static int CS_SetVolume(int volume); static int CS_SetVolume(int volume);
static void cs4218_tdm_tx_intr(void *devid); static void cs4218_tdm_tx_intr(void *devid);
static void cs4218_tdm_rx_intr(void *devid); static void cs4218_tdm_rx_intr(void *devid);
static void cs4218_intr(void *devid, struct pt_regs *regs); static void cs4218_intr(void *devid);
static int cs_get_volume(uint reg); static int cs_get_volume(uint reg);
static int cs_volume_setter(int volume, int mute); static int cs_volume_setter(int volume, int mute);
static int cs_get_gain(uint reg); static int cs_get_gain(uint reg);
...@@ -2646,7 +2646,7 @@ int __init tdm8xx_sound_init(void) ...@@ -2646,7 +2646,7 @@ int __init tdm8xx_sound_init(void)
* full duplex operation. * full duplex operation.
*/ */
static void static void
cs4218_intr(void *dev_id, struct pt_regs *regs) cs4218_intr(void *dev_id)
{ {
volatile smc_t *sp; volatile smc_t *sp;
volatile cpm8xx_t *cp; volatile cpm8xx_t *cp;
......
...@@ -149,7 +149,7 @@ struct scc_enet_private { ...@@ -149,7 +149,7 @@ struct scc_enet_private {
static int scc_enet_open(struct net_device *dev); static int scc_enet_open(struct net_device *dev);
static int scc_enet_start_xmit(struct sk_buff *skb, struct net_device *dev); static int scc_enet_start_xmit(struct sk_buff *skb, struct net_device *dev);
static int scc_enet_rx(struct net_device *dev); static int scc_enet_rx(struct net_device *dev);
static void scc_enet_interrupt(void *dev_id, struct pt_regs *regs); static void scc_enet_interrupt(void *dev_id);
static int scc_enet_close(struct net_device *dev); static int scc_enet_close(struct net_device *dev);
static struct net_device_stats *scc_enet_get_stats(struct net_device *dev); static struct net_device_stats *scc_enet_get_stats(struct net_device *dev);
static void set_multicast_list(struct net_device *dev); static void set_multicast_list(struct net_device *dev);
...@@ -305,7 +305,7 @@ scc_enet_timeout(struct net_device *dev) ...@@ -305,7 +305,7 @@ scc_enet_timeout(struct net_device *dev)
* This is called from the CPM handler, not the MPC core interrupt. * This is called from the CPM handler, not the MPC core interrupt.
*/ */
static void static void
scc_enet_interrupt(void *dev_id, struct pt_regs *regs) scc_enet_interrupt(void *dev_id)
{ {
struct net_device *dev = dev_id; struct net_device *dev = dev_id;
volatile struct scc_enet_private *cep; volatile struct scc_enet_private *cep;
......
...@@ -198,8 +198,7 @@ static int fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev); ...@@ -198,8 +198,7 @@ static int fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev);
#ifdef CONFIG_USE_MDIO #ifdef CONFIG_USE_MDIO
static void fec_enet_mii(struct net_device *dev); static void fec_enet_mii(struct net_device *dev);
#endif /* CONFIG_USE_MDIO */ #endif /* CONFIG_USE_MDIO */
static irqreturn_t fec_enet_interrupt(int irq, void * dev_id, static irqreturn_t fec_enet_interrupt(int irq, void * dev_id);
struct pt_regs * regs);
#ifdef CONFIG_FEC_PACKETHOOK #ifdef CONFIG_FEC_PACKETHOOK
static void fec_enet_tx(struct net_device *dev, __u32 regval); static void fec_enet_tx(struct net_device *dev, __u32 regval);
static void fec_enet_rx(struct net_device *dev, __u32 regval); static void fec_enet_rx(struct net_device *dev, __u32 regval);
...@@ -472,7 +471,7 @@ fec_timeout(struct net_device *dev) ...@@ -472,7 +471,7 @@ fec_timeout(struct net_device *dev)
* This is called from the MPC core interrupt. * This is called from the MPC core interrupt.
*/ */
static irqreturn_t static irqreturn_t
fec_enet_interrupt(int irq, void * dev_id, struct pt_regs * regs) fec_enet_interrupt(int irq, void * dev_id)
{ {
struct net_device *dev = dev_id; struct net_device *dev = dev_id;
volatile fec_t *fecp; volatile fec_t *fecp;
...@@ -1408,7 +1407,7 @@ static ...@@ -1408,7 +1407,7 @@ static
#ifdef CONFIG_RPXCLASSIC #ifdef CONFIG_RPXCLASSIC
void mii_link_interrupt(void *dev_id) void mii_link_interrupt(void *dev_id)
#else #else
irqreturn_t mii_link_interrupt(int irq, void * dev_id, struct pt_regs * regs) irqreturn_t mii_link_interrupt(int irq, void * dev_id)
#endif #endif
{ {
#ifdef CONFIG_USE_MDIO #ifdef CONFIG_USE_MDIO
......
...@@ -84,7 +84,7 @@ smp_message_pass(int target, int msg) ...@@ -84,7 +84,7 @@ smp_message_pass(int target, int msg)
/* /*
* Common functions * Common functions
*/ */
void smp_message_recv(int msg, struct pt_regs *regs) void smp_message_recv(int msg)
{ {
atomic_inc(&ipi_recv); atomic_inc(&ipi_recv);
...@@ -100,7 +100,7 @@ void smp_message_recv(int msg, struct pt_regs *regs) ...@@ -100,7 +100,7 @@ void smp_message_recv(int msg, struct pt_regs *regs)
break; break;
#ifdef CONFIG_XMON #ifdef CONFIG_XMON
case PPC_MSG_XMON_BREAK: case PPC_MSG_XMON_BREAK:
xmon(regs); xmon(get_irq_regs());
break; break;
#endif /* CONFIG_XMON */ #endif /* CONFIG_XMON */
default: default:
......
...@@ -492,7 +492,7 @@ apus_halt(void) ...@@ -492,7 +492,7 @@ apus_halt(void)
static unsigned char last_ipl[8]; static unsigned char last_ipl[8];
int apus_get_irq(struct pt_regs* regs) int apus_get_irq(void)
{ {
unsigned char ipl_emu, mask; unsigned char ipl_emu, mask;
unsigned int level; unsigned int level;
......
...@@ -659,8 +659,7 @@ static void __init hdpu_map_io(void) ...@@ -659,8 +659,7 @@ static void __init hdpu_map_io(void)
char hdpu_smp0[] = "SMP Cpu #0"; char hdpu_smp0[] = "SMP Cpu #0";
char hdpu_smp1[] = "SMP Cpu #1"; char hdpu_smp1[] = "SMP Cpu #1";
static irqreturn_t hdpu_smp_cpu0_int_handler(int irq, void *dev_id, static irqreturn_t hdpu_smp_cpu0_int_handler(int irq, void *dev_id)
struct pt_regs *regs)
{ {
volatile unsigned int doorbell; volatile unsigned int doorbell;
...@@ -670,22 +669,21 @@ static irqreturn_t hdpu_smp_cpu0_int_handler(int irq, void *dev_id, ...@@ -670,22 +669,21 @@ static irqreturn_t hdpu_smp_cpu0_int_handler(int irq, void *dev_id,
mv64x60_write(&bh, MV64360_CPU0_DOORBELL_CLR, doorbell); mv64x60_write(&bh, MV64360_CPU0_DOORBELL_CLR, doorbell);
if (doorbell & 1) { if (doorbell & 1) {
smp_message_recv(0, regs); smp_message_recv(0);
} }
if (doorbell & 2) { if (doorbell & 2) {
smp_message_recv(1, regs); smp_message_recv(1);
} }
if (doorbell & 4) { if (doorbell & 4) {
smp_message_recv(2, regs); smp_message_recv(2);
} }
if (doorbell & 8) { if (doorbell & 8) {
smp_message_recv(3, regs); smp_message_recv(3);
} }
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static irqreturn_t hdpu_smp_cpu1_int_handler(int irq, void *dev_id, static irqreturn_t hdpu_smp_cpu1_int_handler(int irq, void *dev_id)
struct pt_regs *regs)
{ {
volatile unsigned int doorbell; volatile unsigned int doorbell;
...@@ -695,16 +693,16 @@ static irqreturn_t hdpu_smp_cpu1_int_handler(int irq, void *dev_id, ...@@ -695,16 +693,16 @@ static irqreturn_t hdpu_smp_cpu1_int_handler(int irq, void *dev_id,
mv64x60_write(&bh, MV64360_CPU1_DOORBELL_CLR, doorbell); mv64x60_write(&bh, MV64360_CPU1_DOORBELL_CLR, doorbell);
if (doorbell & 1) { if (doorbell & 1) {
smp_message_recv(0, regs); smp_message_recv(0);
} }
if (doorbell & 2) { if (doorbell & 2) {
smp_message_recv(1, regs); smp_message_recv(1);
} }
if (doorbell & 4) { if (doorbell & 4) {
smp_message_recv(2, regs); smp_message_recv(2);
} }
if (doorbell & 8) { if (doorbell & 8) {
smp_message_recv(3, regs); smp_message_recv(3);
} }
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
...@@ -451,11 +451,11 @@ static void __init ppc7d_calibrate_decr(void) ...@@ -451,11 +451,11 @@ static void __init ppc7d_calibrate_decr(void)
* Interrupt stuff * Interrupt stuff
*****************************************************************************/ *****************************************************************************/
static irqreturn_t ppc7d_i8259_intr(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t ppc7d_i8259_intr(int irq, void *dev_id)
{ {
u32 temp = mv64x60_read(&bh, MV64x60_GPP_INTR_CAUSE); u32 temp = mv64x60_read(&bh, MV64x60_GPP_INTR_CAUSE);
if (temp & (1 << 28)) { if (temp & (1 << 28)) {
i8259_irq(regs); i8259_irq();
mv64x60_write(&bh, MV64x60_GPP_INTR_CAUSE, temp & (~(1 << 28))); mv64x60_write(&bh, MV64x60_GPP_INTR_CAUSE, temp & (~(1 << 28)));
return IRQ_HANDLED; return IRQ_HANDLED;
} }
...@@ -536,13 +536,13 @@ static u32 ppc7d_irq_canonicalize(u32 irq) ...@@ -536,13 +536,13 @@ static u32 ppc7d_irq_canonicalize(u32 irq)
return irq; return irq;
} }
static int ppc7d_get_irq(struct pt_regs *regs) static int ppc7d_get_irq(void)
{ {
int irq; int irq;
irq = mv64360_get_irq(regs); irq = mv64360_get_irq();
if (irq == (mv64360_irq_base + MV64x60_IRQ_GPP28)) if (irq == (mv64360_irq_base + MV64x60_IRQ_GPP28))
irq = i8259_irq(regs); irq = i8259_irq();
return irq; return irq;
} }
......
...@@ -121,7 +121,7 @@ struct hw_interrupt_type sbc82xx_i8259_ic = { ...@@ -121,7 +121,7 @@ struct hw_interrupt_type sbc82xx_i8259_ic = {
.end = sbc82xx_i8259_end_irq, .end = sbc82xx_i8259_end_irq,
}; };
static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id)
{ {
spin_lock(&sbc82xx_i8259_lock); spin_lock(&sbc82xx_i8259_lock);
...@@ -139,7 +139,7 @@ static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id, struct pt_regs *re ...@@ -139,7 +139,7 @@ static irqreturn_t sbc82xx_i8259_demux(int irq, void *dev_id, struct pt_regs *re
return IRQ_HANDLED; return IRQ_HANDLED;
} }
} }
__do_IRQ(NR_SIU_INTS + irq, regs); __do_IRQ(NR_SIU_INTS + irq);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
...@@ -91,6 +91,6 @@ extern struct hw_interrupt_type cpc700_pic; ...@@ -91,6 +91,6 @@ extern struct hw_interrupt_type cpc700_pic;
extern unsigned int cpc700_irq_assigns[32][2]; extern unsigned int cpc700_irq_assigns[32][2];
extern void __init cpc700_init_IRQ(void); extern void __init cpc700_init_IRQ(void);
extern int cpc700_get_irq(struct pt_regs *); extern int cpc700_get_irq(void);
#endif /* __PPC_SYSLIB_CPC700_H__ */ #endif /* __PPC_SYSLIB_CPC700_H__ */
...@@ -158,7 +158,7 @@ cpc700_init_IRQ(void) ...@@ -158,7 +158,7 @@ cpc700_init_IRQ(void)
* Find the highest IRQ that generating an interrupt, if any. * Find the highest IRQ that generating an interrupt, if any.
*/ */
int int
cpc700_get_irq(struct pt_regs *regs) cpc700_get_irq(void)
{ {
int irq = 0; int irq = 0;
u_int irq_status, irq_test = 1; u_int irq_status, irq_test = 1;
......
...@@ -123,7 +123,7 @@ static struct hw_interrupt_type cpm2_pic = { ...@@ -123,7 +123,7 @@ static struct hw_interrupt_type cpm2_pic = {
.end = cpm2_end_irq, .end = cpm2_end_irq,
}; };
int cpm2_get_irq(struct pt_regs *regs) int cpm2_get_irq(void)
{ {
int irq; int irq;
unsigned long bits; unsigned long bits;
......
#ifndef _PPC_KERNEL_CPM2_H #ifndef _PPC_KERNEL_CPM2_H
#define _PPC_KERNEL_CPM2_H #define _PPC_KERNEL_CPM2_H
extern int cpm2_get_irq(struct pt_regs *regs); extern int cpm2_get_irq(void);
extern void cpm2_init_IRQ(void); extern void cpm2_init_IRQ(void);
......
...@@ -110,9 +110,6 @@ gt64260_init_irq(void) ...@@ -110,9 +110,6 @@ gt64260_init_irq(void)
* This function returns the lowest interrupt number of all interrupts that * This function returns the lowest interrupt number of all interrupts that
* are currently asserted. * are currently asserted.
* *
* Input Variable(s):
* struct pt_regs* not used
*
* Output Variable(s): * Output Variable(s):
* None. * None.
* *
...@@ -120,7 +117,7 @@ gt64260_init_irq(void) ...@@ -120,7 +117,7 @@ gt64260_init_irq(void)
* int <interrupt number> or -2 (bogus interrupt) * int <interrupt number> or -2 (bogus interrupt)
*/ */
int int
gt64260_get_irq(struct pt_regs *regs) gt64260_get_irq(void)
{ {
int irq; int irq;
int irq_gpp; int irq_gpp;
...@@ -229,7 +226,7 @@ gt64260_mask_irq(unsigned int irq) ...@@ -229,7 +226,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", printk(KERN_ERR "gt64260_cpu_error_int_handler: %s 0x%08x\n",
"Error on CPU interface - Cause regiser", "Error on CPU interface - Cause regiser",
...@@ -250,7 +247,7 @@ gt64260_cpu_error_int_handler(int irq, void *dev_id, struct pt_regs *regs) ...@@ -250,7 +247,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; u32 val;
unsigned int pci_bus = (unsigned int)dev_id; unsigned int pci_bus = (unsigned int)dev_id;
......
...@@ -119,7 +119,7 @@ static inline u32 l2c_diag(u32 addr) ...@@ -119,7 +119,7 @@ static inline u32 l2c_diag(u32 addr)
return mfdcr(DCRN_L2C0_DATA); return mfdcr(DCRN_L2C0_DATA);
} }
static irqreturn_t l2c_error_handler(int irq, void* dev, struct pt_regs* regs) static irqreturn_t l2c_error_handler(int irq, void* dev)
{ {
u32 sr = mfdcr(DCRN_L2C0_SR); u32 sr = mfdcr(DCRN_L2C0_SR);
if (sr & L2C_SR_CPE){ if (sr & L2C_SR_CPE){
......
...@@ -601,7 +601,7 @@ void ipic_clear_mcp_status(u32 mask) ...@@ -601,7 +601,7 @@ void ipic_clear_mcp_status(u32 mask)
} }
/* Return an interrupt vector or -1 if no interrupt is pending. */ /* Return an interrupt vector or -1 if no interrupt is pending. */
int ipic_get_irq(struct pt_regs *regs) int ipic_get_irq(void)
{ {
int irq; int irq;
......
...@@ -117,7 +117,7 @@ struct hw_interrupt_type pq2pci_ic = { ...@@ -117,7 +117,7 @@ struct hw_interrupt_type pq2pci_ic = {
}; };
static irqreturn_t static irqreturn_t
pq2pci_irq_demux(int irq, void *dev_id, struct pt_regs *regs) pq2pci_irq_demux(int irq, void *dev_id)
{ {
unsigned long stat, mask, pend; unsigned long stat, mask, pend;
int bit; int bit;
...@@ -130,7 +130,7 @@ pq2pci_irq_demux(int irq, void *dev_id, struct pt_regs *regs) ...@@ -130,7 +130,7 @@ pq2pci_irq_demux(int irq, void *dev_id, struct pt_regs *regs)
break; break;
for (bit = 0; pend != 0; ++bit, pend <<= 1) { for (bit = 0; pend != 0; ++bit, pend <<= 1) {
if (pend & 0x80000000) if (pend & 0x80000000)
__do_IRQ(NR_CPM_INTS + bit, regs); __do_IRQ(NR_CPM_INTS + bit);
} }
} }
......
...@@ -169,7 +169,7 @@ abort(void) ...@@ -169,7 +169,7 @@ abort(void)
} }
/* A place holder for time base interrupts, if they are ever enabled. */ /* A place holder for time base interrupts, if they are ever enabled. */
irqreturn_t timebase_interrupt(int irq, void * dev, struct pt_regs * regs) irqreturn_t timebase_interrupt(int irq, void * dev)
{ {
printk ("timebase_interrupt()\n"); printk ("timebase_interrupt()\n");
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
static int wdt_timeout; static int wdt_timeout;
int m8xx_has_internal_rtc = 0; int m8xx_has_internal_rtc = 0;
static irqreturn_t m8xx_wdt_interrupt(int, void *, struct pt_regs *); static irqreturn_t m8xx_wdt_interrupt(int, void *);
static struct irqaction m8xx_wdt_irqaction = { static struct irqaction m8xx_wdt_irqaction = {
.handler = m8xx_wdt_interrupt, .handler = m8xx_wdt_interrupt,
.name = "watchdog", .name = "watchdog",
...@@ -35,7 +35,7 @@ void m8xx_wdt_reset(void) ...@@ -35,7 +35,7 @@ void m8xx_wdt_reset(void)
out_be16(&imap->im_siu_conf.sc_swsr, 0xaa39); /* write magic2 */ out_be16(&imap->im_siu_conf.sc_swsr, 0xaa39); /* write magic2 */
} }
static irqreturn_t m8xx_wdt_interrupt(int irq, void *dev, struct pt_regs *regs) static irqreturn_t m8xx_wdt_interrupt(int irq, void *dev)
{ {
volatile immap_t *imap = (volatile immap_t *)IMAP_ADDR; volatile immap_t *imap = (volatile immap_t *)IMAP_ADDR;
......
...@@ -220,7 +220,7 @@ mpc52xx_init_irq(void) ...@@ -220,7 +220,7 @@ mpc52xx_init_irq(void)
} }
int int
mpc52xx_get_irq(struct pt_regs *regs) mpc52xx_get_irq(void)
{ {
u32 status; u32 status;
int irq = -1; int irq = -1;
......
...@@ -55,10 +55,9 @@ ...@@ -55,10 +55,9 @@
static void mv64360_unmask_irq(unsigned int); static void mv64360_unmask_irq(unsigned int);
static void mv64360_mask_irq(unsigned int); static void mv64360_mask_irq(unsigned int);
static irqreturn_t mv64360_cpu_error_int_handler(int, void *, struct pt_regs *); static irqreturn_t mv64360_cpu_error_int_handler(int, void *);
static irqreturn_t mv64360_sram_error_int_handler(int, void *, static irqreturn_t mv64360_sram_error_int_handler(int, void *);
struct pt_regs *); static irqreturn_t mv64360_pci_error_int_handler(int, void *);
static irqreturn_t mv64360_pci_error_int_handler(int, void *, struct pt_regs *);
/* ========================== local declarations =========================== */ /* ========================== local declarations =========================== */
...@@ -131,9 +130,6 @@ mv64360_init_irq(void) ...@@ -131,9 +130,6 @@ mv64360_init_irq(void)
* This function returns the lowest interrupt number of all interrupts that * This function returns the lowest interrupt number of all interrupts that
* are currently asserted. * are currently asserted.
* *
* Input Variable(s):
* struct pt_regs* not used
*
* Output Variable(s): * Output Variable(s):
* None. * None.
* *
...@@ -142,7 +138,7 @@ mv64360_init_irq(void) ...@@ -142,7 +138,7 @@ mv64360_init_irq(void)
* *
*/ */
int int
mv64360_get_irq(struct pt_regs *regs) mv64360_get_irq(void)
{ {
int irq; int irq;
int irq_gpp; int irq_gpp;
...@@ -283,7 +279,7 @@ mv64360_mask_irq(unsigned int irq) ...@@ -283,7 +279,7 @@ mv64360_mask_irq(unsigned int irq)
} }
static irqreturn_t static irqreturn_t
mv64360_cpu_error_int_handler(int irq, void *dev_id, struct pt_regs *regs) mv64360_cpu_error_int_handler(int irq, void *dev_id)
{ {
printk(KERN_ERR "mv64360_cpu_error_int_handler: %s 0x%08x\n", printk(KERN_ERR "mv64360_cpu_error_int_handler: %s 0x%08x\n",
"Error on CPU interface - Cause regiser", "Error on CPU interface - Cause regiser",
...@@ -304,7 +300,7 @@ mv64360_cpu_error_int_handler(int irq, void *dev_id, struct pt_regs *regs) ...@@ -304,7 +300,7 @@ mv64360_cpu_error_int_handler(int irq, void *dev_id, struct pt_regs *regs)
} }
static irqreturn_t static irqreturn_t
mv64360_sram_error_int_handler(int irq, void *dev_id, struct pt_regs *regs) mv64360_sram_error_int_handler(int irq, void *dev_id)
{ {
printk(KERN_ERR "mv64360_sram_error_int_handler: %s 0x%08x\n", printk(KERN_ERR "mv64360_sram_error_int_handler: %s 0x%08x\n",
"Error in internal SRAM - Cause register", "Error in internal SRAM - Cause register",
...@@ -325,7 +321,7 @@ mv64360_sram_error_int_handler(int irq, void *dev_id, struct pt_regs *regs) ...@@ -325,7 +321,7 @@ mv64360_sram_error_int_handler(int irq, void *dev_id, struct pt_regs *regs)
} }
static irqreturn_t static irqreturn_t
mv64360_pci_error_int_handler(int irq, void *dev_id, struct pt_regs *regs) mv64360_pci_error_int_handler(int irq, void *dev_id)
{ {
u32 val; u32 val;
unsigned int pci_bus = (unsigned int)dev_id; unsigned int pci_bus = (unsigned int)dev_id;
......
...@@ -529,7 +529,7 @@ static void openpic2_end_irq(unsigned int irq_nr) ...@@ -529,7 +529,7 @@ static void openpic2_end_irq(unsigned int irq_nr)
} }
int int
openpic2_get_irq(struct pt_regs *regs) openpic2_get_irq(void)
{ {
int irq = openpic2_irq(); int irq = openpic2_irq();
......
...@@ -42,7 +42,7 @@ static struct hw_interrupt_type ppc403_aic = { ...@@ -42,7 +42,7 @@ static struct hw_interrupt_type ppc403_aic = {
}; };
int int
ppc403_pic_get_irq(struct pt_regs *regs) ppc403_pic_get_irq(void)
{ {
int irq; int irq;
unsigned long bits; unsigned long bits;
......
...@@ -96,7 +96,7 @@ UIC_HANDLERS(1); ...@@ -96,7 +96,7 @@ UIC_HANDLERS(1);
UIC_HANDLERS(2); UIC_HANDLERS(2);
UIC_HANDLERS(3); UIC_HANDLERS(3);
static int ppc4xx_pic_get_irq(struct pt_regs *regs) static int ppc4xx_pic_get_irq(void)
{ {
u32 uic0 = mfdcr(DCRN_UIC_MSR(UIC0)); u32 uic0 = mfdcr(DCRN_UIC_MSR(UIC0));
if (uic0 & UIC0_UIC1NC) if (uic0 & UIC0_UIC1NC)
...@@ -125,7 +125,7 @@ UIC_HANDLERS(0); ...@@ -125,7 +125,7 @@ UIC_HANDLERS(0);
UIC_HANDLERS(1); UIC_HANDLERS(1);
UIC_HANDLERS(2); UIC_HANDLERS(2);
static int ppc4xx_pic_get_irq(struct pt_regs *regs) static int ppc4xx_pic_get_irq(void)
{ {
u32 uicb = mfdcr(DCRN_UIC_MSR(UICB)); u32 uicb = mfdcr(DCRN_UIC_MSR(UICB));
if (uicb & UICB_UIC0NC) if (uicb & UICB_UIC0NC)
...@@ -158,7 +158,7 @@ static void __init ppc4xx_pic_impl_init(void) ...@@ -158,7 +158,7 @@ static void __init ppc4xx_pic_impl_init(void)
UIC_HANDLERS(0); UIC_HANDLERS(0);
UIC_HANDLERS(1); UIC_HANDLERS(1);
static int ppc4xx_pic_get_irq(struct pt_regs *regs) static int ppc4xx_pic_get_irq(void)
{ {
u32 uic0 = mfdcr(DCRN_UIC_MSR(UIC0)); u32 uic0 = mfdcr(DCRN_UIC_MSR(UIC0));
if (uic0 & UIC0_UIC1NC) if (uic0 & UIC0_UIC1NC)
...@@ -179,7 +179,7 @@ static void __init ppc4xx_pic_impl_init(void) ...@@ -179,7 +179,7 @@ static void __init ppc4xx_pic_impl_init(void)
#define ACK_UIC0_PARENT #define ACK_UIC0_PARENT
UIC_HANDLERS(0); UIC_HANDLERS(0);
static int ppc4xx_pic_get_irq(struct pt_regs *regs) static int ppc4xx_pic_get_irq(void)
{ {
u32 uic0 = mfdcr(DCRN_UIC_MSR(UIC0)); u32 uic0 = mfdcr(DCRN_UIC_MSR(UIC0));
return uic0 ? 32 - ffs(uic0) : -1; return uic0 ? 32 - ffs(uic0) : -1;
......
...@@ -349,13 +349,12 @@ EXPORT_SYMBOL_GPL(rio_hw_add_outb_message); ...@@ -349,13 +349,12 @@ EXPORT_SYMBOL_GPL(rio_hw_add_outb_message);
* mpc85xx_rio_tx_handler - MPC85xx outbound message interrupt handler * mpc85xx_rio_tx_handler - MPC85xx outbound message interrupt handler
* @irq: Linux interrupt number * @irq: Linux interrupt number
* @dev_instance: Pointer to interrupt-specific data * @dev_instance: Pointer to interrupt-specific data
* @regs: Register context
* *
* Handles outbound message interrupts. Executes a register outbound * Handles outbound message interrupts. Executes a register outbound
* mailbox event handler and acks the interrupt occurence. * mailbox event handler and acks the interrupt occurence.
*/ */
static irqreturn_t static irqreturn_t
mpc85xx_rio_tx_handler(int irq, void *dev_instance, struct pt_regs *regs) mpc85xx_rio_tx_handler(int irq, void *dev_instance)
{ {
int osr; int osr;
struct rio_mport *port = (struct rio_mport *)dev_instance; struct rio_mport *port = (struct rio_mport *)dev_instance;
...@@ -517,13 +516,12 @@ void rio_close_outb_mbox(struct rio_mport *mport, int mbox) ...@@ -517,13 +516,12 @@ void rio_close_outb_mbox(struct rio_mport *mport, int mbox)
* mpc85xx_rio_rx_handler - MPC85xx inbound message interrupt handler * mpc85xx_rio_rx_handler - MPC85xx inbound message interrupt handler
* @irq: Linux interrupt number * @irq: Linux interrupt number
* @dev_instance: Pointer to interrupt-specific data * @dev_instance: Pointer to interrupt-specific data
* @regs: Register context
* *
* Handles inbound message interrupts. Executes a registered inbound * Handles inbound message interrupts. Executes a registered inbound
* mailbox event handler and acks the interrupt occurence. * mailbox event handler and acks the interrupt occurence.
*/ */
static irqreturn_t static irqreturn_t
mpc85xx_rio_rx_handler(int irq, void *dev_instance, struct pt_regs *regs) mpc85xx_rio_rx_handler(int irq, void *dev_instance)
{ {
int isr; int isr;
struct rio_mport *port = (struct rio_mport *)dev_instance; struct rio_mport *port = (struct rio_mport *)dev_instance;
...@@ -736,13 +734,12 @@ EXPORT_SYMBOL_GPL(rio_hw_get_inb_message); ...@@ -736,13 +734,12 @@ EXPORT_SYMBOL_GPL(rio_hw_get_inb_message);
* mpc85xx_rio_dbell_handler - MPC85xx doorbell interrupt handler * mpc85xx_rio_dbell_handler - MPC85xx doorbell interrupt handler
* @irq: Linux interrupt number * @irq: Linux interrupt number
* @dev_instance: Pointer to interrupt-specific data * @dev_instance: Pointer to interrupt-specific data
* @regs: Register context
* *
* Handles doorbell interrupts. Parses a list of registered * Handles doorbell interrupts. Parses a list of registered
* doorbell event handlers and executes a matching event handler. * doorbell event handlers and executes a matching event handler.
*/ */
static irqreturn_t static irqreturn_t
mpc85xx_rio_dbell_handler(int irq, void *dev_instance, struct pt_regs *regs) mpc85xx_rio_dbell_handler(int irq, void *dev_instance)
{ {
int dsr; int dsr;
struct rio_mport *port = (struct rio_mport *)dev_instance; struct rio_mport *port = (struct rio_mport *)dev_instance;
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <asm/mpc8xx.h> #include <asm/mpc8xx.h>
#include "ppc8xx_pic.h" #include "ppc8xx_pic.h"
extern int cpm_get_irq(struct pt_regs *regs); extern int cpm_get_irq(void);
/* The 8xx internal interrupt controller. It is usually /* The 8xx internal interrupt controller. It is usually
* the only interrupt controller. Some boards, like the MBX and * the only interrupt controller. Some boards, like the MBX and
...@@ -96,7 +96,7 @@ m8xx_get_irq(struct pt_regs *regs) ...@@ -96,7 +96,7 @@ m8xx_get_irq(struct pt_regs *regs)
* get back SIU_LEVEL7. In this case, return -1 * get back SIU_LEVEL7. In this case, return -1
*/ */
if (irq == CPM_INTERRUPT) if (irq == CPM_INTERRUPT)
irq = CPM_IRQ_OFFSET + cpm_get_irq(regs); irq = CPM_IRQ_OFFSET + cpm_get_irq();
#if defined(CONFIG_PCI) #if defined(CONFIG_PCI)
else if (irq == ISA_BRIDGE_INT) { else if (irq == ISA_BRIDGE_INT) {
int isa_irq; int isa_irq;
......
...@@ -86,7 +86,7 @@ static struct hw_interrupt_type xilinx_intc = { ...@@ -86,7 +86,7 @@ static struct hw_interrupt_type xilinx_intc = {
}; };
int int
xilinx_pic_get_irq(struct pt_regs *regs) xilinx_pic_get_irq(void)
{ {
int irq; int irq;
......
...@@ -690,8 +690,7 @@ typedef struct risc_timer_pram { ...@@ -690,8 +690,7 @@ typedef struct risc_timer_pram {
#define CICR_IEN ((uint)0x00000080) /* Int. enable */ #define CICR_IEN ((uint)0x00000080) /* Int. enable */
#define CICR_SPS ((uint)0x00000001) /* SCC Spread */ #define CICR_SPS ((uint)0x00000001) /* SCC Spread */
extern void cpm_install_handler(int vec, extern void cpm_install_handler(int vec, void (*handler)(void *), void *dev_id);
void (*handler)(void *, struct pt_regs *regs), void *dev_id);
extern void cpm_free_handler(int vec); extern void cpm_free_handler(int vec);
#endif /* __CPM_8XX__ */ #endif /* __CPM_8XX__ */
...@@ -315,7 +315,7 @@ int gt64260_get_base(u32 *base); ...@@ -315,7 +315,7 @@ int gt64260_get_base(u32 *base);
int gt64260_pci_exclude_device(u8 bus, u8 devfn); int gt64260_pci_exclude_device(u8 bus, u8 devfn);
void gt64260_init_irq(void); void gt64260_init_irq(void);
int gt64260_get_irq(struct pt_regs *regs); int gt64260_get_irq(void);
void gt64260_mpsc_progress(char *s, unsigned short hex); void gt64260_mpsc_progress(char *s, unsigned short hex);
......
...@@ -415,7 +415,7 @@ struct mpc52xx_cdm { ...@@ -415,7 +415,7 @@ struct mpc52xx_cdm {
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
extern void mpc52xx_init_irq(void); extern void mpc52xx_init_irq(void);
extern int mpc52xx_get_irq(struct pt_regs *regs); extern int mpc52xx_get_irq(void);
extern unsigned long mpc52xx_find_end_of_memory(void); extern unsigned long mpc52xx_find_end_of_memory(void);
extern void mpc52xx_set_bat(void); extern void mpc52xx_set_bat(void);
......
...@@ -336,9 +336,9 @@ int mv64x60_pci_exclude_device(u8 bus, u8 devfn); ...@@ -336,9 +336,9 @@ int mv64x60_pci_exclude_device(u8 bus, u8 devfn);
void gt64260_init_irq(void); void gt64260_init_irq(void);
int gt64260_get_irq(struct pt_regs *regs); int gt64260_get_irq(void);
void mv64360_init_irq(void); void mv64360_init_irq(void);
int mv64360_get_irq(struct pt_regs *regs); int mv64360_get_irq(void);
u32 mv64x60_mask(u32 val, u32 num_bits); u32 mv64x60_mask(u32 val, u32 num_bits);
u32 mv64x60_shift_left(u32 val, u32 num_bits); u32 mv64x60_shift_left(u32 val, u32 num_bits);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册