Commit 1425df87 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k/irq: Rename {,__}m68k_handle_int() 



  - Rename m68k_handle_int() to generic_handle_irq(), and drop the unneeded
    asmlinkage,
  - Rename __m68k_handle_int() to do_IRQ().

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent edb34725

arch/m68k/amiga/amiints.c

+12 −12
Original line number Diff line number Diff line
@@ -124,19 +124,19 @@ static irqreturn_t ami_int1(int irq, void *dev_id) 
	/* if serial transmit buffer empty, interrupt */

	if (ints & IF_TBE) {

		amiga_custom.intreq = IF_TBE;

		m68k_handle_int(IRQ_AMIGA_TBE);

		generic_handle_irq(IRQ_AMIGA_TBE);

	}



	/* if floppy disk transfer complete, interrupt */

	if (ints & IF_DSKBLK) {

		amiga_custom.intreq = IF_DSKBLK;

		m68k_handle_int(IRQ_AMIGA_DSKBLK);

		generic_handle_irq(IRQ_AMIGA_DSKBLK);

	}



	/* if software interrupt set, interrupt */

	if (ints & IF_SOFT) {

		amiga_custom.intreq = IF_SOFT;

		m68k_handle_int(IRQ_AMIGA_SOFT);

		generic_handle_irq(IRQ_AMIGA_SOFT);

	}

	return IRQ_HANDLED;

}
@@ -148,19 +148,19 @@ static irqreturn_t ami_int3(int irq, void *dev_id) 
	/* if a blitter interrupt */

	if (ints & IF_BLIT) {

		amiga_custom.intreq = IF_BLIT;

		m68k_handle_int(IRQ_AMIGA_BLIT);

		generic_handle_irq(IRQ_AMIGA_BLIT);

	}



	/* if a copper interrupt */

	if (ints & IF_COPER) {

		amiga_custom.intreq = IF_COPER;

		m68k_handle_int(IRQ_AMIGA_COPPER);

		generic_handle_irq(IRQ_AMIGA_COPPER);

	}



	/* if a vertical blank interrupt */

	if (ints & IF_VERTB) {

		amiga_custom.intreq = IF_VERTB;

		m68k_handle_int(IRQ_AMIGA_VERTB);

		generic_handle_irq(IRQ_AMIGA_VERTB);

	}

	return IRQ_HANDLED;

}
@@ -172,25 +172,25 @@ static irqreturn_t ami_int4(int irq, void *dev_id) 
	/* if audio 0 interrupt */

	if (ints & IF_AUD0) {

		amiga_custom.intreq = IF_AUD0;

		m68k_handle_int(IRQ_AMIGA_AUD0);

		generic_handle_irq(IRQ_AMIGA_AUD0);

	}



	/* if audio 1 interrupt */

	if (ints & IF_AUD1) {

		amiga_custom.intreq = IF_AUD1;

		m68k_handle_int(IRQ_AMIGA_AUD1);

		generic_handle_irq(IRQ_AMIGA_AUD1);

	}



	/* if audio 2 interrupt */

	if (ints & IF_AUD2) {

		amiga_custom.intreq = IF_AUD2;

		m68k_handle_int(IRQ_AMIGA_AUD2);

		generic_handle_irq(IRQ_AMIGA_AUD2);

	}



	/* if audio 3 interrupt */

	if (ints & IF_AUD3) {

		amiga_custom.intreq = IF_AUD3;

		m68k_handle_int(IRQ_AMIGA_AUD3);

		generic_handle_irq(IRQ_AMIGA_AUD3);

	}

	return IRQ_HANDLED;

}
@@ -202,13 +202,13 @@ static irqreturn_t ami_int5(int irq, void *dev_id) 
	/* if serial receive buffer full interrupt */

	if (ints & IF_RBF) {

		/* acknowledge of IF_RBF must be done by the serial interrupt */

		m68k_handle_int(IRQ_AMIGA_RBF);

		generic_handle_irq(IRQ_AMIGA_RBF);

	}



	/* if a disk sync interrupt */

	if (ints & IF_DSKSYN) {

		amiga_custom.intreq = IF_DSKSYN;

		m68k_handle_int(IRQ_AMIGA_DSKSYN);

		generic_handle_irq(IRQ_AMIGA_DSKSYN);

	}

	return IRQ_HANDLED;

}

arch/m68k/amiga/cia.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static irqreturn_t cia_handler(int irq, void *dev_id) 
	amiga_custom.intreq = base->int_mask;

	for (; ints; mach_irq++, ints >>= 1) {

		if (ints & 1)

			m68k_handle_int(mach_irq);

			generic_handle_irq(mach_irq);

	}

	return IRQ_HANDLED;

}

arch/m68k/apollo/dn_ints.c

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


void dn_process_int(unsigned int irq, struct pt_regs *fp)

{

	__m68k_handle_int(irq, fp);

	do_IRQ(irq, fp);



	*(volatile unsigned char *)(pica)=0x20;

	*(volatile unsigned char *)(picb)=0x20;

arch/m68k/include/asm/irq.h

+2 −2
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ extern void m68k_setup_irq_chip(struct irq_chip *, unsigned int, unsigned int); 
#define m68k_setup_irq_controller(chip, dummy, irq, cnt) \

	m68k_setup_irq_chip((chip), (irq), (cnt))



asmlinkage void m68k_handle_int(unsigned int);

asmlinkage void __m68k_handle_int(unsigned int, struct pt_regs *);

extern void generic_handle_irq(unsigned int);

asmlinkage void do_IRQ(int irq, struct pt_regs *regs);



#else

#define irq_canonicalize(irq)  (irq)

arch/m68k/kernel/entry_mm.S

+2 −2
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ ENTRY(auto_inthandler) 
	movel	%sp,%sp@-

	movel	%d0,%sp@-		|  put vector # on stack

auto_irqhandler_fixup = . + 2

	jsr	__m68k_handle_int	|  process the IRQ

	jsr	do_IRQ			|  process the IRQ

	addql	#8,%sp			|  pop parameters off stack



ret_from_interrupt:
@@ -241,7 +241,7 @@ user_irqvec_fixup = . + 2 
	movel	%sp,%sp@-

	movel	%d0,%sp@-		|  put vector # on stack

user_irqhandler_fixup = . + 2

	jsr	__m68k_handle_int	|  process the IRQ

	jsr	do_IRQ			|  process the IRQ

	addql	#8,%sp			|  pop parameters off stack



	subqb	#1,%curptr@(TASK_INFO+TINFO_PREEMPT+1)