7 files changed, 26 insertions, 29 deletions

diff --git a/drivers/scsi/53c7xx.c b/drivers/scsi/53c7xx.c
index 2341d27ceed7..7a33c708f5b3 100644
--- a/drivers/scsi/53c7xx.c
+++ b/drivers/scsi/53c7xx.c
@@ -6090,8 +6090,8 @@ NCR53c7x0_release(struct Scsi_Host *host) {
     if (hostdata->num_cmds)
         printk ("scsi%d : leaked %d NCR53c7x0_cmd structures\n",
             host->host_no, hostdata->num_cmds);
-    if (hostdata->events) 
-        vfree ((void *)hostdata->events);
+
+    vfree(hostdata->events);
 
     /* XXX This assumes default cache mode to be IOMAP_FULL_CACHING, which
      * XXX may be invalid (CONFIG_060_WRITETHROUGH)
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c
index bd0e1b6be1ea..da6e51c7fe69 100644
--- a/drivers/scsi/ch.c
+++ b/drivers/scsi/ch.c
@@ -116,7 +116,7 @@ typedef struct {
 } scsi_changer;
 
 static LIST_HEAD(ch_devlist);
-static spinlock_t ch_devlist_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(ch_devlist_lock);
 static int ch_devcount;
 
 static struct scsi_driver ch_template =
@@ -560,7 +560,7 @@ ch_set_voltag(scsi_changer *ch, u_int elem,
         return result;
 }
 
-static int ch_gstatus(scsi_changer *ch, int type, unsigned char *dest)
+static int ch_gstatus(scsi_changer *ch, int type, unsigned char __user *dest)
 {
         int retval = 0;
         u_char data[16];
@@ -634,6 +634,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
 {
         scsi_changer *ch = file->private_data;
         int retval;
+        void __user *argp = (void __user *)arg;
         
         switch (cmd) {
         case CHIOGPARAMS:
@@ -646,7 +647,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
                 params.cp_nportals  = ch->counts[CHET_IE];
                 params.cp_ndrives   = ch->counts[CHET_DT];
                 
-                if (copy_to_user((void *) arg, &params, sizeof(params)))
+                if (copy_to_user(argp, &params, sizeof(params)))
                         return -EFAULT;
                 return 0;
         }
@@ -671,7 +672,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
                         vparams.cvp_n4  = ch->counts[CHET_V4];
                         strncpy(vparams.cvp_label4,vendor_labels[3],16);
                 }
-                if (copy_to_user((void *) arg, &vparams, sizeof(vparams)))
+                if (copy_to_user(argp, &vparams, sizeof(vparams)))
                         return -EFAULT;
                 return 0;
         }
@@ -680,7 +681,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
         {
                 struct changer_position pos;
                 
-                if (copy_from_user(&pos, (void*)arg, sizeof (pos)))
+                if (copy_from_user(&pos, argp, sizeof (pos)))
                         return -EFAULT;
 
                 if (0 != ch_checkrange(ch, pos.cp_type, pos.cp_unit)) {
@@ -699,7 +700,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
         {
                 struct changer_move mv;
 
-                if (copy_from_user(&mv, (void*)arg, sizeof (mv)))
+                if (copy_from_user(&mv, argp, sizeof (mv)))
                         return -EFAULT;
 
                 if (0 != ch_checkrange(ch, mv.cm_fromtype, mv.cm_fromunit) ||
@@ -721,7 +722,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
         {
                 struct changer_exchange mv;
                 
-                if (copy_from_user(&mv, (void*)arg, sizeof (mv)))
+                if (copy_from_user(&mv, argp, sizeof (mv)))
                         return -EFAULT;
 
                 if (0 != ch_checkrange(ch, mv.ce_srctype,  mv.ce_srcunit ) ||
@@ -746,7 +747,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
         {
                 struct changer_element_status ces;
                 
-                if (copy_from_user(&ces, (void*)arg, sizeof (ces)))
+                if (copy_from_user(&ces, argp, sizeof (ces)))
                         return -EFAULT;
                 if (ces.ces_type < 0 || ces.ces_type >= CH_TYPES)
                         return -EINVAL;
@@ -762,7 +763,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
                 unsigned int elem;
                 int     result,i;
                 
-                if (copy_from_user(&cge, (void*)arg, sizeof (cge)))
+                if (copy_from_user(&cge, argp, sizeof (cge)))
                         return -EFAULT;
 
                 if (0 != ch_checkrange(ch, cge.cge_type, cge.cge_unit))
@@ -825,7 +826,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
                 kfree(buffer);
                 up(&ch->lock);
                 
-                if (copy_to_user((void*)arg, &cge, sizeof (cge)))
+                if (copy_to_user(argp, &cge, sizeof (cge)))
                         return -EFAULT;
                 return result;
         }
@@ -843,7 +844,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
                 struct changer_set_voltag csv;
                 int elem;
 
-                if (copy_from_user(&csv, (void*)arg, sizeof(csv)))
+                if (copy_from_user(&csv, argp, sizeof(csv)))
                         return -EFAULT;
 
                 if (0 != ch_checkrange(ch, csv.csv_type, csv.csv_unit)) {
@@ -861,7 +862,7 @@ static int ch_ioctl(struct inode * inode, struct file * file,
         }
 
         default:
-                return scsi_ioctl(ch->device, cmd, (void*)arg);
+                return scsi_ioctl(ch->device, cmd, argp);
 
         }
 }
@@ -894,9 +895,9 @@ static long ch_ioctl_compat(struct file * file,
         case CHIOGSTATUS32:
         {
                 struct changer_element_status32 ces32;
-                unsigned char *data;
+                unsigned char __user *data;
                 
-                if (copy_from_user(&ces32, (void*)arg, sizeof (ces32)))
+                if (copy_from_user(&ces32, (void __user *)arg, sizeof (ces32)))
                         return -EFAULT;
                 if (ces32.ces_type < 0 || ces32.ces_type >= CH_TYPES)
                         return -EINVAL;
diff --git a/drivers/scsi/cpqfcTSinit.c b/drivers/scsi/cpqfcTSinit.c
index d72be0ce89c8..3fda8d455c5b 100644
--- a/drivers/scsi/cpqfcTSinit.c
+++ b/drivers/scsi/cpqfcTSinit.c
@@ -691,8 +691,7 @@ int cpqfcTS_ioctl( struct scsi_device *ScsiDev, int Cmnd, void *arg)
         if(  copy_to_user( vendor_cmd->bufp, buf, vendor_cmd->len))
                 result = -EFAULT;
 
-        if( buf) 
-          kfree( buf);
+        kfree(buf);
 
         return result;
       }
diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c
index b5dc35355570..6e54c7d9b33c 100644
--- a/drivers/scsi/ibmmca.c
+++ b/drivers/scsi/ibmmca.c
@@ -36,7 +36,6 @@
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
 #include <linux/mca.h>
-#include <linux/string.h>
 #include <linux/spinlock.h>
 #include <linux/init.h>
 #include <linux/mca-legacy.h>
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 89a4a0615c22..3f2f2464fa63 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -1377,7 +1377,7 @@ static int osst_read_back_buffer_and_rewrite(struct osst_tape * STp, struct scsi
         
                 if ((STp->buffer)->syscall_result || !SRpnt) {
                         printk(KERN_ERR "%s:E: Failed to read frame back from OnStream buffer\n", name);
-                        vfree((void *)buffer);
+                        vfree(buffer);
                         *aSRpnt = SRpnt;
                         return (-EIO);
                 }
@@ -1419,7 +1419,7 @@ static int osst_read_back_buffer_and_rewrite(struct osst_tape * STp, struct scsi
 
                         if (new_frame > frame + 1000) {
                                 printk(KERN_ERR "%s:E: Failed to find writable tape media\n", name);
-                                vfree((void *)buffer);
+                                vfree(buffer);
                                 return (-EIO);
                         }
                         if ( i >= nframes + pending ) break;
@@ -1500,7 +1500,7 @@ static int osst_read_back_buffer_and_rewrite(struct osst_tape * STp, struct scsi
                              SRpnt->sr_sense_buffer[12]         ==  0 &&
                              SRpnt->sr_sense_buffer[13]         ==  2) {
                                 printk(KERN_ERR "%s:E: Volume overflow in write error recovery\n", name);
-                                vfree((void *)buffer);
+                                vfree(buffer);
                                 return (-EIO);                  /* hit end of tape = fail */
                         }
                         i = ((SRpnt->sr_sense_buffer[3] << 24) |
@@ -1525,7 +1525,7 @@ static int osst_read_back_buffer_and_rewrite(struct osst_tape * STp, struct scsi
         }
         if (!pending)
                 osst_copy_to_buffer(STp->buffer, p);    /* so buffer content == at entry in all cases */
-        vfree((void *)buffer);
+        vfree(buffer);
         return 0;
 }
 
@@ -5852,7 +5852,7 @@ static int osst_remove(struct device *dev)
                         os_scsi_tapes[i] = NULL;
                         osst_nr_dev--;
                         write_unlock(&os_scsi_tapes_lock);
-                        if (tpnt->header_cache != NULL) vfree(tpnt->header_cache);
+                        vfree(tpnt->header_cache);
                         if (tpnt->buffer) {
                                 normalize_buffer(tpnt->buffer);
                                 kfree(tpnt->buffer);
@@ -5896,8 +5896,7 @@ static void __exit exit_osst (void)
                 for (i=0; i < osst_max_dev; ++i) {
                         if (!(STp = os_scsi_tapes[i])) continue;
                         /* This is defensive, supposed to happen during detach */
-                        if (STp->header_cache)
-                                vfree(STp->header_cache);
+                        vfree(STp->header_cache);
                         if (STp->buffer) {
                                 normalize_buffer(STp->buffer);
                                 kfree(STp->buffer);
diff --git a/drivers/scsi/pluto.c b/drivers/scsi/pluto.c
index 623082d3a83f..c89da7d5b6df 100644
--- a/drivers/scsi/pluto.c
+++ b/drivers/scsi/pluto.c
@@ -95,8 +95,7 @@ int __init pluto_detect(Scsi_Host_Template *tpnt)
         int i, retry, nplutos;
         fc_channel *fc;
         Scsi_Device dev;
-        struct timer_list fc_timer =
-                TIMER_INITIALIZER(pluto_detect_timeout, 0, 0);
+        DEFINE_TIMER(fc_timer, pluto_detect_timeout, 0, 0);
 
         tpnt->proc_name = "pluto";
         fcscount = 0;
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index 72bbaa91dc77..9791496fa788 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -1334,7 +1334,7 @@ qla24xx_fw_dump(scsi_qla_host_t *ha, int hardware_locked)
 
                 dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);
                 WRT_REG_DWORD(dmp_reg, 0xB0200000);
-                dmp_reg = (uint32_t *)((uint8_t *)reg + 0xFC);
+                dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC);
                 fw->shadow_reg[2] = RD_REG_DWORD(dmp_reg);
 
                 dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0);