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

Commit 44883eb0 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k/atari: Change VME irq numbers from unsigned long to unsigned int 



Device interrupts numbers were changed to unsigned int in 1997, the year
IRQ_MACHSPEC was killed as well.

Also kill a related cast while we're at it.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Cc: netdev@vger.kernel.org
parent e2b56288

arch/m68k/atari/ataints.c

+2 −2
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ void __init atari_init_IRQ(void) 
 * hardware with a programmable int vector (probably a VME board).

 */



unsigned long atari_register_vme_int(void)

unsigned int atari_register_vme_int(void)

{

	int i;
@@ -223,7 +223,7 @@ unsigned long atari_register_vme_int(void) 
EXPORT_SYMBOL(atari_register_vme_int);





void atari_unregister_vme_int(unsigned long irq)

void atari_unregister_vme_int(unsigned int irq)

{

	if (irq >= VME_SOURCE_BASE && irq < VME_SOURCE_BASE + VME_MAX_SOURCES) {

		irq -= VME_SOURCE_BASE;

arch/m68k/include/asm/atariints.h

+2 −2
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static inline int atari_irq_pending( unsigned irq ) 
	return( get_mfp_bit( irq, MFP_PENDING ) );

}



unsigned long atari_register_vme_int( void );

void atari_unregister_vme_int( unsigned long );

unsigned int atari_register_vme_int(void);

void atari_unregister_vme_int(unsigned int);



#endif /* linux/atariints.h */

drivers/net/ethernet/amd/atarilance.c

+4 −7
Original line number Diff line number Diff line
@@ -558,21 +558,18 @@ static unsigned long __init lance_probe1( struct net_device *dev, 
			printk( "Lance: request for irq %d failed\n", IRQ_AUTO_5 );

			return 0;

		}

		dev->irq = (unsigned short)IRQ_AUTO_5;

		dev->irq = IRQ_AUTO_5;

	}

	else {

		/* For VME-RieblCards, request a free VME int;

		 * (This must be unsigned long, since dev->irq is short and the

		 * IRQ_MACHSPEC bit would be cut off...)

		 */

		unsigned long irq = atari_register_vme_int();

		/* For VME-RieblCards, request a free VME int */

		unsigned int irq = atari_register_vme_int();

		if (!irq) {

			printk( "Lance: request for VME interrupt failed\n" );

			return 0;

		}

		if (request_irq(irq, lance_interrupt, IRQ_TYPE_PRIO,

		            "Riebl-VME Ethernet", dev)) {

			printk( "Lance: request for irq %ld failed\n", irq );

			printk( "Lance: request for irq %u failed\n", irq );

			return 0;

		}

		dev->irq = irq;