1 files changed, 2 insertions, 21 deletions

diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c
index 188e734c7ff0..7c6fa1479c9c 100644
--- a/drivers/scsi/arm/oak.c
+++ b/drivers/scsi/arm/oak.c
@@ -14,13 +14,9 @@
 #include <asm/ecard.h>
 #include <asm/io.h>
 
-#include "../scsi.h"
 #include <scsi/scsi_host.h>
 
-#define AUTOSENSE
 /*#define PSEUDO_DMA*/
-
-#define OAKSCSI_PUBLIC_RELEASE 1
 #define DONT_USE_INTR
 
 #define priv(host)                      ((struct NCR5380_hostdata *)(host)->hostdata)
@@ -29,10 +25,9 @@
 
 #define NCR5380_read(reg)               readb(_base + ((reg) << 2))
 #define NCR5380_write(reg, value)       writeb(value, _base + ((reg) << 2))
-#define NCR5380_intr                    oakscsi_intr
 #define NCR5380_queue_command           oakscsi_queue_command
+#define NCR5380_info                    oakscsi_info
 #define NCR5380_show_info               oakscsi_show_info
-#define NCR5380_write_info              oakscsi_write_info
 
 #define NCR5380_implementation_fields   \
         void __iomem *base
@@ -42,11 +37,6 @@
 #undef START_DMA_INITIATOR_RECEIVE_REG
 #define START_DMA_INITIATOR_RECEIVE_REG (128 + 7)
 
-const char * oakscsi_info (struct Scsi_Host *spnt)
-{
-        return "";
-}
-
 #define STAT    ((128 + 16) << 2)
 #define DATA    ((128 + 8) << 2)
 
@@ -114,7 +104,6 @@ printk("reading %p len %d\n", addr, len);
 static struct scsi_host_template oakscsi_template = {
         .module                 = THIS_MODULE,
         .show_info              = oakscsi_show_info,
-        .write_info             = oakscsi_write_info,
         .name                   = "Oak 16-bit SCSI",
         .info                   = oakscsi_info,
         .queuecommand           = oakscsi_queue_command,
@@ -150,19 +139,11 @@ static int oakscsi_probe(struct expansion_card *ec, const struct ecard_id *id)
                 goto unreg;
         }
 
-        host->irq = IRQ_NONE;
+        host->irq = NO_IRQ;
         host->n_io_port = 255;
 
         NCR5380_init(host, 0);
 
-        printk("scsi%d: at port 0x%08lx irqs disabled",
-                host->host_no, host->io_port);
-        printk(" options CAN_QUEUE=%d  CMD_PER_LUN=%d release=%d",
-                host->can_queue, host->cmd_per_lun, OAKSCSI_PUBLIC_RELEASE);
-        printk("\nscsi%d:", host->host_no);
-        NCR5380_print_options(host);
-        printk("\n");
-
         ret = scsi_add_host(host, &ec->dev);
         if (ret)
                 goto out_unmap;