vserver 1.9.5.x5

[linux-2.6.git] / drivers / scsi / sim710.c

diff --git a/drivers/scsi/sim710.c b/drivers/scsi/sim710.c
index 2a833d3..add007a 100644 (file)
--- a/drivers/scsi/sim710.c
+++ b/drivers/scsi/sim710.c
@@ -35,9 +35,11 @@
 #include <linux/mca.h>
 #include <linux/eisa.h>
 #include <linux/interrupt.h>
+#include <scsi/scsi_host.h>
+#include <scsi/scsi_device.h>
+#include <scsi/scsi_transport.h>
+#include <scsi/scsi_transport_spi.h>
 
-#include "scsi.h"
-#include "hosts.h"
 #include "53c700.h"
 
 
@@ -51,7 +53,7 @@ MODULE_AUTHOR("Richard Hirst");
 MODULE_DESCRIPTION("Simple NCR53C710 driver");
 MODULE_LICENSE("GPL");
 
-MODULE_PARM(sim710, "s");
+module_param(sim710, charp, 0);
 
 #ifdef MODULE
 #define ARG_SEP ' '
@@ -86,7 +88,7 @@ param_setup(char *str)
 }
 __setup("sim710=", param_setup);
 
-static Scsi_Host_Template sim710_driver_template = {
+static struct scsi_host_template sim710_driver_template = {
        .name                   = "LSI (Symbios) 710 MCA/EISA",
        .proc_name              = "sim710",
        .this_id                = 7,
@@ -125,28 +127,16 @@ sim710_probe_common(struct device *dev, unsigned long base_addr,
        NCR_700_set_io_mapped(hostdata);
 
        /* and register the chip */
-       if((host = NCR_700_detect(&sim710_driver_template, hostdata)) == NULL) {
+       if((host = NCR_700_detect(&sim710_driver_template, hostdata, dev, irq,
+                                 scsi_id)) == NULL) {
                printk(KERN_ERR "sim710: No host detected; card configuration problem?\n");
                goto out_release;
        }
 
-       host->irq = irq;
-       host->this_id = scsi_id;
-
-       if(request_irq(irq, NCR_700_intr, SA_SHIRQ, "sim710", host)) {
-               printk(KERN_ERR "sim710: irq problem with %d, detaching\n",
-                      irq);
-               goto out_unregister;
-       }
-
-       scsi_add_host(host, dev); /* XXX handle failure */
        scsi_scan_host(host);
-       hostdata->dev = dev;
 
        return 0;
 
- out_unregister:
-       scsi_host_put(host);
  out_release:
        release_region(host->base, 64);
  out_free: