Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index f343fc7..777f9bc 100644 (file)
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -222,7 +222,7 @@ static struct Scsi_Host *default_instance;
 #endif
 
 /*
- * Function : int macscsi_detect(Scsi_Host_Template * tpnt)
+ * Function : int macscsi_detect(struct scsi_host_template * tpnt)
  *
  * Purpose : initializes mac NCR5380 driver based on the
  *     command line / compile time port and irq definitions.
@@ -233,7 +233,7 @@ static struct Scsi_Host *default_instance;
  *
  */
  
-int macscsi_detect(Scsi_Host_Template * tpnt)
+int macscsi_detect(struct scsi_host_template * tpnt)
 {
     static int called = 0;
     int flags = 0;
@@ -302,7 +302,7 @@ int macscsi_detect(Scsi_Host_Template * tpnt)
 
     if (instance->irq != SCSI_IRQ_NONE)
        if (request_irq(instance->irq, NCR5380_intr, IRQ_FLG_SLOW, 
-               "ncr5380", NCR5380_intr)) {
+               "ncr5380", instance)) {
            printk(KERN_WARNING "scsi%d: IRQ%d not free, interrupts disabled\n",
                   instance->host_no, instance->irq);
            instance->irq = SCSI_IRQ_NONE;
@@ -326,6 +326,7 @@ int macscsi_release (struct Scsi_Host *shpnt)
 {
        if (shpnt->irq != SCSI_IRQ_NONE)
                free_irq (shpnt->irq, NCR5380_intr);
+       NCR5380_exit(shpnt);
 
        return 0;
 }
@@ -580,7 +581,7 @@ static int macscsi_pwrite (struct Scsi_Host *instance,
 
 #include "NCR5380.c"
 
-static Scsi_Host_Template driver_template = {
+static struct scsi_host_template driver_template = {
        .proc_name                      = "Mac5380",
        .proc_info                      = macscsi_proc_info,
        .name                           = "Macintosh NCR5380 SCSI",
@@ -590,8 +591,6 @@ static Scsi_Host_Template driver_template = {
        .queuecommand                   = macscsi_queue_command,
        .eh_abort_handler               = macscsi_abort,
        .eh_bus_reset_handler           = macscsi_bus_reset,
-       .eh_device_reset_handler        = macscsi_device_reset,
-       .eh_host_reset_handler          = macscsi_host_reset,
        .can_queue                      = CAN_QUEUE,
        .this_id                        = 7,
        .sg_tablesize                   = SG_ALL,