5 files changed, 27 insertions, 25 deletions

diff --git a/drivers/net/ethernet/amd/ariadne.c b/drivers/net/ethernet/amd/ariadne.c
index f4c228e4d76c..f2958df9a1e4 100644
--- a/drivers/net/ethernet/amd/ariadne.c
+++ b/drivers/net/ethernet/amd/ariadne.c
@@ -213,10 +213,10 @@ static int ariadne_rx(struct net_device *dev)
                                                 (const void *)priv->rx_buff[entry],
                                                 pkt_len);
                         skb->protocol = eth_type_trans(skb, dev);
-                        netdev_dbg(dev, "RX pkt type 0x%04x from %pM to %pM data 0x%08x len %d\n",
+                        netdev_dbg(dev, "RX pkt type 0x%04x from %pM to %pM data %p len %u\n",
                                    ((u_short *)skb->data)[6],
                                    skb->data + 6, skb->data,
-                                   (int)skb->data, (int)skb->len);
+                                   skb->data, skb->len);
 
                         netif_rx(skb);
                         dev->stats.rx_packets++;
@@ -566,10 +566,10 @@ static netdev_tx_t ariadne_start_xmit(struct sk_buff *skb,
 
         /* Fill in a Tx ring entry */
 
-        netdev_dbg(dev, "TX pkt type 0x%04x from %pM to %pM data 0x%08x len %d\n",
+        netdev_dbg(dev, "TX pkt type 0x%04x from %pM to %pM data %p len %u\n",
                    ((u_short *)skb->data)[6],
                    skb->data + 6, skb->data,
-                   (int)skb->data, (int)skb->len);
+                   skb->data, skb->len);
 
         local_irq_save(flags);
 
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;
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index 04a154f87e3e..df740cbbaef4 100644
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -572,7 +572,7 @@ static void falcon_get_lock(void)
 }
 
 
-int __init atari_scsi_detect(struct scsi_host_template *host)
+static int __init atari_scsi_detect(struct scsi_host_template *host)
 {
         static int called = 0;
         struct Scsi_Host *instance;
@@ -724,7 +724,7 @@ int __init atari_scsi_detect(struct scsi_host_template *host)
         return 1;
 }
 
-int atari_scsi_release(struct Scsi_Host *sh)
+static int atari_scsi_release(struct Scsi_Host *sh)
 {
         if (IS_A_TT())
                 free_irq(IRQ_TT_MFP_SCSI, sh);
@@ -734,17 +734,21 @@ int atari_scsi_release(struct Scsi_Host *sh)
         return 1;
 }
 
-void __init atari_scsi_setup(char *str, int *ints)
+#ifndef MODULE
+static int __init atari_scsi_setup(char *str)
 {
         /* Format of atascsi parameter is:
          *   atascsi=<can_queue>,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags>
          * Defaults depend on TT or Falcon, hostid determined at run time.
          * Negative values mean don't change.
          */
+        int ints[6];
+
+        get_options(str, ARRAY_SIZE(ints), ints);
 
         if (ints[0] < 1) {
                 printk("atari_scsi_setup: no arguments!\n");
-                return;
+                return 0;
         }
 
         if (ints[0] >= 1) {
@@ -777,9 +781,14 @@ void __init atari_scsi_setup(char *str, int *ints)
                         setup_use_tagged_queuing = !!ints[5];
         }
 #endif
+
+        return 1;
 }
 
-int atari_scsi_bus_reset(Scsi_Cmnd *cmd)
+__setup("atascsi=", atari_scsi_setup);
+#endif /* !MODULE */
+
+static int atari_scsi_bus_reset(Scsi_Cmnd *cmd)
 {
         int rv;
         struct NCR5380_hostdata *hostdata =
@@ -852,7 +861,7 @@ static void __init atari_scsi_reset_boot(void)
 #endif
 
 
-const char *atari_scsi_info(struct Scsi_Host *host)
+static const char *atari_scsi_info(struct Scsi_Host *host)
 {
         /* atari_scsi_detect() is verbose enough... */
         static const char string[] = "Atari native SCSI";
@@ -862,8 +871,9 @@ const char *atari_scsi_info(struct Scsi_Host *host)
 
 #if defined(REAL_DMA)
 
-unsigned long atari_scsi_dma_setup(struct Scsi_Host *instance, void *data,
-                                   unsigned long count, int dir)
+static unsigned long atari_scsi_dma_setup(struct Scsi_Host *instance,
+                                          void *data, unsigned long count,
+                                          int dir)
 {
         unsigned long addr = virt_to_phys(data);
 
diff --git a/drivers/scsi/atari_scsi.h b/drivers/scsi/atari_scsi.h
index efadb8d567c2..bd52df78b209 100644
--- a/drivers/scsi/atari_scsi.h
+++ b/drivers/scsi/atari_scsi.h
@@ -18,11 +18,6 @@
 /* (I_HAVE_OVERRUNS stuff removed) */
 
 #ifndef ASM
-int atari_scsi_detect (struct scsi_host_template *);
-const char *atari_scsi_info (struct Scsi_Host *);
-int atari_scsi_reset (Scsi_Cmnd *, unsigned int);
-int atari_scsi_release (struct Scsi_Host *);
-
 /* The values for CMD_PER_LUN and CAN_QUEUE are somehow arbitrary. Higher
  * values should work, too; try it! (but cmd_per_lun costs memory!) */
 
diff --git a/drivers/usb/musb/musb_io.h b/drivers/usb/musb/musb_io.h
index 1d5eda26fbd1..f7c1c8e2dc3f 100644
--- a/drivers/usb/musb/musb_io.h
+++ b/drivers/usb/musb/musb_io.h
@@ -40,7 +40,7 @@
 #if !defined(CONFIG_ARM) && !defined(CONFIG_SUPERH) \
         && !defined(CONFIG_AVR32) && !defined(CONFIG_PPC32) \
         && !defined(CONFIG_PPC64) && !defined(CONFIG_BLACKFIN) \
-        && !defined(CONFIG_MIPS)
+        && !defined(CONFIG_MIPS) && !defined(CONFIG_M68K)
 static inline void readsl(const void __iomem *addr, void *buf, int len)
         { insl((unsigned long)addr, buf, len); }
 static inline void readsw(const void __iomem *addr, void *buf, int len)