X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Fsim710.c;h=add007a81e0e673bd3b260e235ecdc4e27458dae;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=f73bf835d145b82c7595275d7e5cbd050c5e4cc2;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/drivers/scsi/sim710.c b/drivers/scsi/sim710.c
index f73bf835d..add007a81 100644
--- a/drivers/scsi/sim710.c
+++ b/drivers/scsi/sim710.c
@@ -36,6 +36,9 @@
 #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 "53c700.h"
 
@@ -50,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 ' '
@@ -124,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: