diff -ur ./drivers/scsi/gdth.c ./drivers/scsi/gdth.c
--- ./drivers/scsi/gdth.c	Tue Jan 29 05:27:02 2002
+++ ./drivers/scsi/gdth.c	Tue Jan 29 05:27:33 2002
@@ -629,10 +629,10 @@
 #define GDTH_LOCK_HA(ha,flags)          spin_lock_irqsave(&(ha)->smp_lock,flags)
 #define GDTH_UNLOCK_HA(ha,flags)        spin_unlock_irqrestore(&(ha)->smp_lock,flags)
 
-#define GDTH_LOCK_SCSI_DONE(dev, flags)      spin_lock_irqsave(((struct Scsi_Host *)dev->host_lock),flags)
-#define GDTH_UNLOCK_SCSI_DONE(flags)    spin_unlock_irqrestore(((struct Scsi_Host *)dev->host_lock),flags)
-#define GDTH_LOCK_SCSI_DOCMD(dev)          spin_lock_irq(((struct Scsi_Host *)dev->host_lock))
-#define GDTH_UNLOCK_SCSI_DOCMD(dev)        spin_unlock_irq(((struct Scsi_Host *)dev->host_lock))
+#define GDTH_LOCK_SCSI_DONE(dev, flags)      spin_lock_irqsave(dev->host_lock,flags)
+#define GDTH_UNLOCK_SCSI_DONE(flags)    spin_unlock_irqrestore(dev->host_lock,flags)
+#define GDTH_LOCK_SCSI_DOCMD(dev)          spin_lock_irq(dev->host_lock)
+#define GDTH_UNLOCK_SCSI_DOCMD(dev)        spin_unlock_irq(dev->host_lock)
 #else
 #define GDTH_INIT_LOCK_HA(ha)           do {} while (0)
 #define GDTH_LOCK_HA(ha,flags)          do {save_flags(flags); cli();} while (0)
diff -ur ./drivers/scsi/ibmmca.c ./drivers/scsi/ibmmca.c
--- ./drivers/scsi/ibmmca.c	Tue Jan 29 05:27:02 2002
+++ ./drivers/scsi/ibmmca.c	Tue Jan 29 05:27:33 2002
@@ -41,8 +41,8 @@
 /* current version of this driver-source: */
 #define IBMMCA_SCSI_DRIVER_VERSION "4.0b"
 
-#define IBMLOCK(dev) spin_lock_irqsave(((struct Scsi_Host *)dev)->host_lock, flags);
-#define IBMUNLOCK(dev) spin_unlock_irqrestore(((struct Scsi_Host *)dev)->host_lock, flags);
+#define IBMLOCK(dev) spin_lock_irqsave(dev->host_lock, flags);
+#define IBMUNLOCK(dev) spin_unlock_irqrestore(dev->host_lock, flags);
 
 /* driver configuration */
 #define IM_MAX_HOSTS     8 /* maximum number of host adapters */
diff -ur ./drivers/scsi/megaraid.c ./drivers/scsi/megaraid.c
--- ./drivers/scsi/megaraid.c	Tue Jan 29 05:27:02 2002
+++ ./drivers/scsi/megaraid.c	Tue Jan 29 05:27:33 2002
@@ -586,10 +586,10 @@
 #define DRIVER_LOCK(p)
 #define DRIVER_UNLOCK(p)
 #define IO_LOCK_T unsigned long io_flags = 0
-#define IO_LOCK(host) spin_lock_irqsave((host)->host_lock,io_flags)
-#define IO_UNLOCK(host) spin_unlock_irqrestore((host)->host_lock,io_flags)
-#define IO_LOCK_IRQ(host) spin_lock_irq((host)->host_lock)
-#define IO_UNLOCK_IRQ(host) spin_unlock_irq((host)->host_lock)
+#define IO_LOCK(host) spin_lock_irqsave(host->host_lock,io_flags)
+#define IO_UNLOCK(host) spin_unlock_irqrestore(host->host_lock,io_flags)
+#define IO_LOCK_IRQ(host) spin_lock_irq(host->host_lock)
+#define IO_UNLOCK_IRQ(host) spin_unlock_irq(host->host_lock)
 
 #define queue_task_irq(a,b)     queue_task(a,b)
 #define queue_task_irq_off(a,b) queue_task(a,b)