[PATCH] M68k wd33c93_{abort,host_reset}()

Use new wd33c93_{abort,host_reset}() routines introduced in 2.5.67 in the m68k
wd33c93-based SCSI host adapter drivers:
  - Amiga A2091 SCSI
  - Amiga A3000 SCSI
  - Amiga GVP Series II SCSI
  - MVME147 SCSI

These drivers still have to implement their own adapter-specific bus_reset()
routines!

diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index da1ecb60619fb1bd97e10dcbec4dcffa974065d5..e8cb31564efc6a97a6244cbba398ac9b12089345 100644 (file)
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -233,6 +233,13 @@ int __init a2091_detect(Scsi_Host_Template *tpnt)
     return num_a2091;
 }
 
+static int a2091_bus_reset(Scsi_Cmnd *cmd)
+{
+       /* FIXME perform bus-specific reset */
+       wd33c93_host_reset(cmd);
+       return SUCCESS;
+}
+
 #define HOSTS_C
 
 static Scsi_Host_Template driver_template = {
@@ -241,8 +248,9 @@ static Scsi_Host_Template driver_template = {
        .detect                 = a2091_detect,
        .release                = a2091_release,
        .queuecommand           = wd33c93_queuecommand,
-       .abort                  = wd33c93_abort,
-       .reset                  = wd33c93_reset,
+       .eh_abort_handler       = wd33c93_abort,
+       .eh_bus_reset_handler   = a2091_bus_reset,
+       .eh_host_reset_handler  = wd33c93_host_reset,
        .can_queue              = CAN_QUEUE,
        .this_id                = 7,
        .sg_tablesize           = SG_ALL,

diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c
index 6482d0efbe544828a5ae9f1690f83e47c635722e..073c406344e7db23556340b15a6b29f1078e6880 100644 (file)
--- a/drivers/scsi/a3000.c
+++ b/drivers/scsi/a3000.c
@@ -206,6 +206,13 @@ fail_register:
     return 0;
 }
 
+static int a3000_bus_reset(Scsi_Cmnd *cmd)
+{
+       /* FIXME perform bus-specific reset */
+       wd33c93_host_reset(cmd);
+       return SUCCESS;
+}
+
 #define HOSTS_C
 
 static Scsi_Host_Template driver_template = {
@@ -214,8 +221,9 @@ static Scsi_Host_Template driver_template = {
        .detect                 = a3000_detect,
        .release                = a3000_release,
        .queuecommand           = wd33c93_queuecommand,
-       .abort                  = wd33c93_abort,
-       .reset                  = wd33c93_reset,
+       .eh_abort_handler       = wd33c93_abort,
+       .eh_bus_reset_handler   = a3000_bus_reset,
+       .eh_host_reset_handler  = wd33c93_host_reset,
        .can_queue              = CAN_QUEUE,
        .this_id                = 7,
        .sg_tablesize           = SG_ALL,

diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c
index 63b29a9602a32ffe11babe21bc459a2f5e34a295..cbfba8bf3cd0e5ef4b702e4eda90bf902481b7fd 100644 (file)
--- a/drivers/scsi/gvp11.c
+++ b/drivers/scsi/gvp11.c
@@ -355,6 +355,13 @@ release:
     return num_gvp11;
 }
 
+static int gvp11_bus_reset(Scsi_Cmnd *cmd)
+{
+       /* FIXME perform bus-specific reset */
+       wd33c93_host_reset(cmd);
+       return SUCCESS;
+}
+
 
 #define HOSTS_C
 
@@ -366,8 +373,9 @@ static Scsi_Host_Template driver_template = {
        .detect                 = gvp11_detect,
        .release                = gvp11_release,
        .queuecommand           = wd33c93_queuecommand,
-       .abort                  = wd33c93_abort,
-       .reset                  = wd33c93_reset,
+       .eh_abort_handler       = wd33c93_abort,
+       .eh_bus_reset_handler   = gvp11_bus_reset,
+       .eh_host_reset_handler  = wd33c93_host_reset,
        .can_queue              = CAN_QUEUE,
        .this_id                = 7,
        .sg_tablesize           = SG_ALL,

diff --git a/drivers/scsi/mvme147.c b/drivers/scsi/mvme147.c
index 8698e9b541b8e1084f3b247d52ddea879add619a..e7c6d9cb450c0f73256dce882954d2a35ea65e25 100644 (file)
--- a/drivers/scsi/mvme147.c
+++ b/drivers/scsi/mvme147.c
@@ -113,6 +113,13 @@ int mvme147_detect(Scsi_Host_Template *tpnt)
     return 0;
 }
 
+static int mvme147_bus_reset(Scsi_Cmnd *cmd)
+{
+       /* FIXME perform bus-specific reset */
+       wd33c93_host_reset(cmd);
+       return SUCCESS;
+}
+
 #define HOSTS_C
 
 #include "mvme147.h"
@@ -123,8 +130,9 @@ static Scsi_Host_Template driver_template = {
        .detect                 = mvme147_detect,
        .release                = mvme147_release,
        .queuecommand           = wd33c93_queuecommand,
-       .abort                  = wd33c93_abort,
-       .reset                  = wd33c93_reset,
+       .eh_abort_handler       = wd33c93_abort,
+       .eh_bus_reset_handler   = mvme147_bus_reset,
+       .eh_host_reset_handler  = wd33c93_host_reset,
        .can_queue              = CAN_QUEUE,
        .this_id                = 7,
        .sg_tablesize           = SG_ALL,