1 files changed, 3 insertions, 8 deletions

diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 48f9ece1cbd0..973c51fb0fe2 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -1430,8 +1430,6 @@ static int tw_scsi_eh_reset(struct scsi_cmnd *SCpnt)
 
         tw_dev = (TW_Device_Extension *)SCpnt->device->host->hostdata;
 
-        spin_unlock_irq(tw_dev->host->host_lock);
-
         tw_dev->num_resets++;
 
         printk(KERN_WARNING "3w-xxxx: scsi%d: WARNING: Unit #%d: Command (0x%x) timed out, resetting card.\n", tw_dev->host->host_no, SCpnt->device->id, SCpnt->cmnd[0]);
@@ -1444,7 +1442,6 @@ static int tw_scsi_eh_reset(struct scsi_cmnd *SCpnt)
 
         retval = SUCCESS;
 out:
-        spin_lock_irq(tw_dev->host->host_lock);
         return retval;
 } /* End tw_scsi_eh_reset() */
 
@@ -2267,9 +2264,9 @@ static void __tw_shutdown(TW_Device_Extension *tw_dev)
 } /* End __tw_shutdown() */
 
 /* Wrapper for __tw_shutdown */
-static void tw_shutdown(struct device *dev)
+static void tw_shutdown(struct pci_dev *pdev)
 {
-        struct Scsi_Host *host = pci_get_drvdata(to_pci_dev(dev));
+        struct Scsi_Host *host = pci_get_drvdata(pdev);
         TW_Device_Extension *tw_dev = (TW_Device_Extension *)host->hostdata;
 
         __tw_shutdown(tw_dev);
@@ -2454,9 +2451,7 @@ static struct pci_driver tw_driver = {
         .id_table       = tw_pci_tbl,
         .probe          = tw_probe,
         .remove         = tw_remove,
-        .driver         = {
-                .shutdown = tw_shutdown
-        }
+        .shutdown       = tw_shutdown,
 };
 
 /* This function is called on driver initialization */