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

Commit 30c0527d authored by Finn Thain's avatar Finn Thain Committed by Geert Uytterhoeven
Browse files

m68k/mac: cleanup mac_irq_pending 



mac_irq_pending() has only one caller (mac_esp.c). Nothing tests for Baboon, PSC or OSS pending interrupts. Until that need arises, let's keep it simple and remove all the unused abstraction. Replace it with a routine to check for SCSI DRQ.

Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 56e63689

arch/m68k/include/asm/mac_via.h

+2 −0
Original line number Diff line number Diff line
@@ -254,6 +254,8 @@ 
extern volatile __u8 *via1,*via2;

extern int rbv_present,via_alt_mapping;



extern int via2_scsi_drq_pending(void);



static inline int rbv_set_video_bpp(int bpp)

{

	char val = (bpp==1)?0:(bpp==2)?1:(bpp==4)?2:(bpp==8)?3:-1;

arch/m68k/include/asm/macintosh.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
extern void mac_reset(void);

extern void mac_poweroff(void);

extern void mac_init_IRQ(void);

extern int mac_irq_pending(unsigned int);



extern void mac_irq_enable(struct irq_data *data);

extern void mac_irq_disable(struct irq_data *data);

arch/m68k/mac/baboon.c

+0 −7
Original line number Diff line number Diff line
@@ -123,10 +123,3 @@ void baboon_irq_disable(int irq) 
	if (baboon_disabled)

		mac_irq_disable(irq_get_irq_data(IRQ_NUBUS_C));

}
 


int baboon_irq_pending(int irq)

{

	int irq_idx = IRQ_IDX(irq);



	return baboon->mb_ifr & (1 << irq_idx);

}

arch/m68k/mac/macints.c

+0 −32
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ extern void via_register_interrupts(void); 
extern void via_irq_enable(int);

extern void via_irq_disable(int);

extern void via_irq_clear(int);

extern int  via_irq_pending(int);



/*

 * OSS hooks
@@ -152,7 +151,6 @@ extern void oss_register_interrupts(void); 
extern void oss_irq_enable(int);

extern void oss_irq_disable(int);

extern void oss_irq_clear(int);

extern int  oss_irq_pending(int);



/*

 * PSC hooks
@@ -162,7 +160,6 @@ extern void psc_register_interrupts(void); 
extern void psc_irq_enable(int);

extern void psc_irq_disable(int);

extern void psc_irq_clear(int);

extern int  psc_irq_pending(int);



/*

 * IOP hooks
@@ -239,7 +236,6 @@ void __init mac_init_IRQ(void) 
/*

 *  mac_irq_enable - enable an interrupt source

 * mac_irq_disable - disable an interrupt source

 * mac_irq_pending - returns the pending status of an IRQ (nonzero = pending)

 *

 * These routines are just dispatchers to the VIA/OSS/PSC routines.

 */
@@ -314,34 +310,6 @@ void mac_irq_disable(struct irq_data *data) 
	}

}



int mac_irq_pending(unsigned int irq)

{

	switch(IRQ_SRC(irq)) {

	case 1:

		return via_irq_pending(irq);

	case 2:

	case 7:

		if (oss_present)

			return oss_irq_pending(irq);

		else

			return via_irq_pending(irq);

	case 3:

	case 5:

	case 6:

		if (psc_present)

			return psc_irq_pending(irq);

		else if (oss_present)

			return oss_irq_pending(irq);

		break;

	case 4:

		if (psc_present)

			return psc_irq_pending(irq);

		break;

	}

	return 0;

}

EXPORT_SYMBOL(mac_irq_pending);



static int num_debug[8];



irqreturn_t mac_debug_handler(int irq, void *dev_id)

arch/m68k/mac/oss.c

+0 −29
Original line number Diff line number Diff line
@@ -219,32 +219,3 @@ void oss_irq_disable(int irq) { 
#endif

	}

}
 


/*

 * Check to see if a specific OSS interrupt is pending

 */



int oss_irq_pending(int irq)

{

	switch(irq) {

		case IRQ_MAC_SCC:

			return oss->irq_pending & OSS_IP_IOPSCC;

			break;

		case IRQ_MAC_ADB:

			return oss->irq_pending & OSS_IP_IOPISM;

			break;

		case IRQ_MAC_SCSI:

			return oss->irq_pending & OSS_IP_SCSI;

			break;

		case IRQ_NUBUS_9:

		case IRQ_NUBUS_A:

		case IRQ_NUBUS_B:

		case IRQ_NUBUS_C:

		case IRQ_NUBUS_D:

		case IRQ_NUBUS_E:

			irq -= NUBUS_SOURCE_BASE;

			return oss->irq_pending & (1 << irq);

			break;

	}

	return 0;

}