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: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: netdev@vger.kernel.org

diff --git a/arch/m68k/atari/ataints.c b/arch/m68k/atari/ataints.c
index 783d8f02360ddfe0e3a01dfce968fc7050e7070b..3f41092d1b70569e572a4b1f43a7adbf2f5aff39 100644 (file)
--- a/arch/m68k/atari/ataints.c
+++ b/arch/m68k/atari/ataints.c
@@ -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;

diff --git a/arch/m68k/include/asm/atariints.h b/arch/m68k/include/asm/atariints.h
index 656bbbf5a6ff7e2940b0c573473c5b7b2885c355..5fc13bdf9044274d01b51b9c460135373b53dbc2 100644 (file)
--- a/arch/m68k/include/asm/atariints.h
+++ b/arch/m68k/include/asm/atariints.h
@@ -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 */

diff --git a/drivers/net/ethernet/amd/atarilance.c b/drivers/net/ethernet/amd/atarilance.c
index 70ed79c46245a4b3bdbe71b3eddf2258cf23e929..84219df72f5122bf9bcd3d4ce103bca6d197fbe4 100644 (file)
--- a/drivers/net/ethernet/amd/atarilance.c
+++ b/drivers/net/ethernet/amd/atarilance.c
@@ -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;