Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 40081
b: refs/heads/master
c: 36d98e7
h: refs/heads/master
i:
  40079: ac2c1e5
v: v3
  • Loading branch information
Ralf Baechle committed Oct 19, 2006
1 parent f41e541 commit 389f680
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ba38cdf94285a1fc6a01fd493bdc5304bc83f61e
refs/heads/master: 36d98e79b798fb27e38b9be4f36c5a96025f9281
2 changes: 1 addition & 1 deletion trunk/arch/mips/au1000/common/dbdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ au1xxx_dbdma_chan_free(u32 chanid)
EXPORT_SYMBOL(au1xxx_dbdma_chan_free);

static irqreturn_t
dbdma_interrupt(int irq, void *dev_id, struct pt_regs *regs)
dbdma_interrupt(int irq, void *dev_id)
{
u32 intstat;
u32 chan_index;
Expand Down
3 changes: 1 addition & 2 deletions trunk/arch/mips/oprofile/op_model_rm9000.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ static void rm9000_cpu_stop(void *args)
write_c0_perfcontrol(0);
}

static irqreturn_t rm9000_perfcount_handler(int irq, void * dev_id,
struct pt_regs *regs)
static irqreturn_t rm9000_perfcount_handler(int irq, void * dev_id)
{
unsigned int control = read_c0_perfcontrol();
uint32_t counter1, counter2;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/mips/sgi-ip32/ip32-reset.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ static inline void ip32_power_button(void)
add_timer(&power_timer);
}

static irqreturn_t ip32_rtc_int(int irq, void *dev_id, struct pt_regs *regs)
static irqreturn_t ip32_rtc_int(int irq, void *dev_id)
{
volatile unsigned char reg_c;

Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/mips/sibyte/sb1250/bcm1250_tbprof.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ static void arm_tb(void)
sbp.tb_armed = 1;
}

static irqreturn_t sbprof_tb_intr(int irq, void *dev_id, struct pt_regs *regs)
static irqreturn_t sbprof_tb_intr(int irq, void *dev_id)
{
int i;
DBG(printk(DEVNAME ": tb_intr\n"));
Expand Down Expand Up @@ -138,7 +138,7 @@ static irqreturn_t sbprof_tb_intr(int irq, void *dev_id, struct pt_regs *regs)
return IRQ_HANDLED;
}

static irqreturn_t sbprof_pc_intr(int irq, void *dev_id, struct pt_regs *regs)
static irqreturn_t sbprof_pc_intr(int irq, void *dev_id)
{
printk(DEVNAME ": unexpected pc_intr");
return IRQ_NONE;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/mips/sibyte/sb1250/bus_watcher.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ static void create_proc_decoder(struct bw_stats_struct *stats)
* notes: possible re-entry due to multiple sources
* should check/indicate saturation
*/
static irqreturn_t sibyte_bw_int(int irq, void *data, struct pt_regs *regs)
static irqreturn_t sibyte_bw_int(int irq, void *data)
{
struct bw_stats_struct *stats = data;
unsigned long cntr;
Expand Down

0 comments on commit 389f680

Please sign in to comment.