[PATCH] Clean up struct flock64 definitions

[linux-2.6] / drivers / scsi / qlogicfas408.c

diff --git a/drivers/scsi/qlogicfas408.c b/drivers/scsi/qlogicfas408.c
index 5b6ce0a88f085651ef5cb104442dfbee8dbf992b..cb75e0b7baeafe62fcdc304cffc2525a1ca65a03 100644 (file)
--- a/drivers/scsi/qlogicfas408.c
+++ b/drivers/scsi/qlogicfas408.c
@@ -511,27 +511,15 @@ int qlogicfas408_abort(Scsi_Cmnd * cmd)
 int qlogicfas408_bus_reset(Scsi_Cmnd * cmd)
 {
        struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);
-       priv->qabort = 2;
-       ql_zap(priv);
-       return SUCCESS;
-}
-
-/* 
- *     Reset SCSI host controller
- */
+       unsigned long flags;
 
-int qlogicfas408_host_reset(Scsi_Cmnd * cmd)
-{
-       return FAILED;
-}
+       priv->qabort = 2;
 
-/* 
- *     Reset SCSI device
- */
+       spin_lock_irqsave(cmd->device->host->host_lock, flags);
+       ql_zap(priv);
+       spin_unlock_irqrestore(cmd->device->host->host_lock, flags);
 
-int qlogicfas408_device_reset(Scsi_Cmnd * cmd)
-{
-       return FAILED;
+       return SUCCESS;
 }
 
 /*
@@ -626,8 +614,6 @@ EXPORT_SYMBOL(qlogicfas408_info);
 EXPORT_SYMBOL(qlogicfas408_queuecommand);
 EXPORT_SYMBOL(qlogicfas408_abort);
 EXPORT_SYMBOL(qlogicfas408_bus_reset);
-EXPORT_SYMBOL(qlogicfas408_device_reset);
-EXPORT_SYMBOL(qlogicfas408_host_reset);
 EXPORT_SYMBOL(qlogicfas408_biosparam);
 EXPORT_SYMBOL(qlogicfas408_ihandl);
 EXPORT_SYMBOL(qlogicfas408_get_chip_type);