[PATCH] clean up inline static vs static inline

[powerpc.git] / drivers / scsi / NCR5380.c

diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 7ae19d4..f8ec6fe 100644 (file)
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -2825,11 +2825,17 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) {
  * Locks: host lock taken by caller
  */
 
-static int NCR5380_bus_reset(Scsi_Cmnd * cmd) {
+static int NCR5380_bus_reset(Scsi_Cmnd * cmd)
+{
+       struct Scsi_Host *instance = cmd->device->host;
+
        NCR5380_local_declare();
-       NCR5380_setup(cmd->device->host);
+       NCR5380_setup(instance);
+       NCR5380_print_status(instance);
+
+       spin_lock_irq(instance->host_lock);
+       do_reset(instance);
+       spin_unlock_irq(instance->host_lock);
 
-       NCR5380_print_status(cmd->device->host);
-       do_reset(cmd->device->host);
        return SUCCESS;
 }