Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35f3c518 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Updates for IRQ handler changes. 



Trivial fixes for build breakage introduced by IRQ handler changes.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent a700f359

arch/sh/boards/hp6xx/hp6xx_apm.c

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int hp6x0_apm_get_info(char *buf, char **start, off_t fpos, int length) 
	return p - buf;

}



static irqreturn_t hp6x0_apm_interrupt(int irq, void *dev, struct pt_regs *regs)

static irqreturn_t hp6x0_apm_interrupt(int irq, void *dev)

{

	if (!apm_suspended)

		apm_queue_event(APM_USER_SUSPEND);
@@ -96,7 +96,7 @@ static int __init hp6x0_apm_init(void) 
	int ret;



	ret = request_irq(HP680_BTN_IRQ, hp6x0_apm_interrupt,

			  SA_INTERRUPT, MODNAME, 0);

			  IRQF_DISABLED, MODNAME, 0);

	if (unlikely(ret < 0)) {

		printk(KERN_ERR MODNAME ": IRQ %d request failed\n",

		       HP680_BTN_IRQ);

arch/sh/boards/landisk/landisk_pwb.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static int swdrv_write(struct file *filp, const char *buff, size_t count, 
	return count;

}



static irqreturn_t sw_interrupt(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t sw_interrupt(int irq, void *dev_id)

{

	landisk_btn = (0x0ff & (~ctrl_inb(PA_STATUS)));

	disable_irq(IRQ_BUTTON);

arch/sh/boards/mpc1211/setup.c

+2 −3
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ static void __init pci_write_config(unsigned long busNo, 


static unsigned char m_irq_mask = 0xfb;

static unsigned char s_irq_mask = 0xff;

volatile unsigned long irq_err_count;



static void disable_mpc1211_irq(unsigned int irq)

{
@@ -118,7 +117,7 @@ static void mask_and_ack_mpc1211(unsigned int irq) 
	if(irq < 8) {

		if(m_irq_mask & (1<<irq)){

		  if(!mpc1211_irq_real(irq)){

		    irq_err_count++;

		    atomic_inc(&irq_err_count)

		    printk("spurious 8259A interrupt: IRQ %x\n",irq);

		   }

		} else {
@@ -131,7 +130,7 @@ static void mask_and_ack_mpc1211(unsigned int irq) 
	} else {

		if(s_irq_mask & (1<<(irq - 8))){

		  if(!mpc1211_irq_real(irq)){

		    irq_err_count++;

		    atomic_inc(&irq_err_count);

		    printk("spurious 8259A interrupt: IRQ %x\n",irq);

		  }

		} else {

arch/sh/boards/snapgear/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ extern void pcibios_init(void); 
 * EraseConfig handling functions

 */



static irqreturn_t eraseconfig_interrupt(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t eraseconfig_interrupt(int irq, void *dev_id)

{

	volatile char dummy __attribute__((unused)) = * (volatile char *) 0xb8000000;

arch/sh/cchips/hd6446x/hd64461/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static struct hw_interrupt_type hd64461_irq_type = { 
	.end		= end_hd64461_irq,

};



static irqreturn_t hd64461_interrupt(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t hd64461_interrupt(int irq, void *dev_id)

{

	printk(KERN_INFO

	       "HD64461: spurious interrupt, nirr: 0x%x nimr: 0x%x\n",