aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/fc4
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2005-06-27 16:43:06 -0400
committerJames Bottomley <jejb@mulgrave.(none)>2005-07-02 20:12:10 -0400
commitfc2b035d38c06a884cb521bb4a1e1183f5eaccf1 (patch)
tree421258fe7c6fc4d49b7ed9f6ef3995f25b361358 /drivers/fc4
parenteda912e34a0cc40ddd502b3f984e37ebb2b13a71 (diff)
[SCSI] ifdef out broken fc4 EH code
This code pokes deep into EH internals and duplicates scsi_error.c code wrongly. It doesn't compile anymore in scsi-misc, so let's #if 0 out the code - the driver hasn't worked for more than five years anyway. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/fc4')
-rw-r--r--drivers/fc4/fc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c
index e3c958823533..5d961f5e0ca0 100644
--- a/drivers/fc4/fc.c
+++ b/drivers/fc4/fc.c
@@ -365,6 +365,7 @@ void fcp_register(fc_channel *fc, u8 type, int unregister)
365 kfree (fc->scsi_bitmap); 365 kfree (fc->scsi_bitmap);
366 kfree (fc->cmd_slots); 366 kfree (fc->cmd_slots);
367 FCND(("Unregistering\n")); 367 FCND(("Unregistering\n"));
368#if 0
368 if (fc->rst_pkt) { 369 if (fc->rst_pkt) {
369 if (fc->rst_pkt->eh_state == SCSI_STATE_UNUSED) 370 if (fc->rst_pkt->eh_state == SCSI_STATE_UNUSED)
370 kfree(fc->rst_pkt); 371 kfree(fc->rst_pkt);
@@ -373,6 +374,7 @@ void fcp_register(fc_channel *fc, u8 type, int unregister)
373 printk("FC: Reset in progress. Now?!"); 374 printk("FC: Reset in progress. Now?!");
374 } 375 }
375 } 376 }
377#endif
376 FCND(("Unregistered\n")); 378 FCND(("Unregistered\n"));
377 } 379 }
378 } else 380 } else
@@ -915,6 +917,7 @@ int fcp_scsi_abort(Scsi_Cmnd *SCpnt)
915 } 917 }
916} 918}
917 919
920#if 0
918void fcp_scsi_reset_done(Scsi_Cmnd *SCpnt) 921void fcp_scsi_reset_done(Scsi_Cmnd *SCpnt)
919{ 922{
920 fc_channel *fc = FC_SCMND(SCpnt); 923 fc_channel *fc = FC_SCMND(SCpnt);
@@ -922,11 +925,13 @@ void fcp_scsi_reset_done(Scsi_Cmnd *SCpnt)
922 fc->rst_pkt->eh_state = SCSI_STATE_FINISHED; 925 fc->rst_pkt->eh_state = SCSI_STATE_FINISHED;
923 up(fc->rst_pkt->device->host->eh_action); 926 up(fc->rst_pkt->device->host->eh_action);
924} 927}
928#endif
925 929
926#define FCP_RESET_TIMEOUT (2*HZ) 930#define FCP_RESET_TIMEOUT (2*HZ)
927 931
928int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt) 932int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt)
929{ 933{
934#if 0 /* broken junk, but if davem wants to compile this driver, let him.. */
930 unsigned long flags; 935 unsigned long flags;
931 fcp_cmd *cmd; 936 fcp_cmd *cmd;
932 fcp_cmnd *fcmd; 937 fcp_cmnd *fcmd;
@@ -1000,6 +1005,7 @@ int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt)
1000 } 1005 }
1001 fc->rst_pkt->eh_state = SCSI_STATE_UNUSED; 1006 fc->rst_pkt->eh_state = SCSI_STATE_UNUSED;
1002 return SUCCESS; 1007 return SUCCESS;
1008#endif
1003} 1009}
1004 1010
1005static int __fcp_scsi_host_reset(Scsi_Cmnd *SCpnt) 1011static int __fcp_scsi_host_reset(Scsi_Cmnd *SCpnt)