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

1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/net/ethernet/amd/atarilance.c b/drivers/net/ethernet/amd/atarilance.c
index 70ed79c46245..84219df72f51 100644
--- 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;