i2c-s3c2410: Remove unconditional 1ms delay on each transfer
[safe/jmp/linux-2.6] / drivers / scsi / ch.c
index 2b07014..4799d43 100644 (file)
@@ -22,6 +22,8 @@
 #include <linux/chio.h>                        /* here are all the ioctls */
 #include <linux/mutex.h>
 #include <linux/idr.h>
+#include <linux/smp_lock.h>
+#include <linux/slab.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -40,6 +42,7 @@ MODULE_DESCRIPTION("device driver for scsi media changer devices");
 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org>");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_CHARDEV_MAJOR(SCSI_CHANGER_MAJOR);
+MODULE_ALIAS_SCSI_DEVICE(TYPE_MEDIUM_CHANGER);
 
 static int init = 1;
 module_param(init, int, 0444);
@@ -90,16 +93,6 @@ static const char * vendor_labels[CH_TYPES-4] = {
 
 #define MAX_RETRIES   1
 
-static int  ch_probe(struct device *);
-static int  ch_remove(struct device *);
-static int  ch_open(struct inode * inode, struct file * filp);
-static int  ch_release(struct inode * inode, struct file * filp);
-static long ch_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
-#ifdef CONFIG_COMPAT
-static long ch_ioctl_compat(struct file * filp,
-                           unsigned int cmd, unsigned long arg);
-#endif
-
 static struct class * ch_sysfs_class;
 
 typedef struct {
@@ -118,33 +111,12 @@ typedef struct {
 static DEFINE_IDR(ch_index_idr);
 static DEFINE_SPINLOCK(ch_index_lock);
 
-static struct scsi_driver ch_template =
-{
-       .owner          = THIS_MODULE,
-       .gendrv         = {
-               .name   = "ch",
-               .probe  = ch_probe,
-               .remove = ch_remove,
-       },
-};
-
-static const struct file_operations changer_fops =
-{
-       .owner          = THIS_MODULE,
-       .open           = ch_open,
-       .release        = ch_release,
-       .unlocked_ioctl = ch_ioctl,
-#ifdef CONFIG_COMPAT
-       .compat_ioctl   = ch_ioctl_compat,
-#endif
-};
-
 static const struct {
        unsigned char  sense;
        unsigned char  asc;
        unsigned char  ascq;
        int            errno;
-} err[] = {
+} ch_err[] = {
 /* Just filled in what looks right. Hav'nt checked any standard paper for
    these errno assignments, so they may be wrong... */
        {
@@ -186,11 +158,11 @@ static int ch_find_errno(struct scsi_sense_hdr *sshdr)
        /* Check to see if additional sense information is available */
        if (scsi_sense_valid(sshdr) &&
            sshdr->asc != 0) {
-               for (i = 0; err[i].errno != 0; i++) {
-                       if (err[i].sense == sshdr->sense_key &&
-                           err[i].asc   == sshdr->asc &&
-                           err[i].ascq  == sshdr->ascq) {
-                               errno = -err[i].errno;
+               for (i = 0; ch_err[i].errno != 0; i++) {
+                       if (ch_err[i].sense == sshdr->sense_key &&
+                           ch_err[i].asc   == sshdr->asc &&
+                           ch_err[i].ascq  == sshdr->ascq) {
+                               errno = -ch_err[i].errno;
                                break;
                        }
                }
@@ -207,7 +179,7 @@ ch_do_scsi(scsi_changer *ch, unsigned char *cmd,
 {
        int errno, retries = 0, timeout, result;
        struct scsi_sense_hdr sshdr;
-       
+
        timeout = (cmd[0] == INITIALIZE_ELEMENT_STATUS)
                ? timeout_init : timeout_move;
 
@@ -220,7 +192,7 @@ ch_do_scsi(scsi_changer *ch, unsigned char *cmd,
 
         result = scsi_execute_req(ch->device, cmd, direction, buffer,
                                  buflength, &sshdr, timeout * HZ,
-                                 MAX_RETRIES);
+                                 MAX_RETRIES, NULL);
 
        dprintk("result: 0x%x\n",result);
        if (driver_byte(result) & DRIVER_SENSE) {
@@ -245,7 +217,7 @@ static int
 ch_elem_to_typecode(scsi_changer *ch, u_int elem)
 {
        int i;
-       
+
        for (i = 0; i < CH_TYPES; i++) {
                if (elem >= ch->firsts[i]  &&
                    elem <  ch->firsts[i] +
@@ -261,15 +233,15 @@ ch_read_element_status(scsi_changer *ch, u_int elem, char *data)
        u_char  cmd[12];
        u_char  *buffer;
        int     result;
-       
+
        buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
        if(!buffer)
                return -ENOMEM;
-       
+
  retry:
        memset(cmd,0,sizeof(cmd));
        cmd[0] = READ_ELEMENT_STATUS;
-       cmd[1] = (ch->device->lun << 5) | 
+       cmd[1] = (ch->device->lun << 5) |
                (ch->voltags ? 0x10 : 0) |
                ch_elem_to_typecode(ch,elem);
        cmd[2] = (elem >> 8) & 0xff;
@@ -296,7 +268,7 @@ ch_read_element_status(scsi_changer *ch, u_int elem, char *data)
        return result;
 }
 
-static int 
+static int
 ch_init_elem(scsi_changer *ch)
 {
        int err;
@@ -322,7 +294,7 @@ ch_readconfig(scsi_changer *ch)
        buffer = kzalloc(512, GFP_KERNEL | GFP_DMA);
        if (!buffer)
                return -ENOMEM;
-       
+
        memset(cmd,0,sizeof(cmd));
        cmd[0] = MODE_SENSE;
        cmd[1] = ch->device->lun << 5;
@@ -365,7 +337,7 @@ ch_readconfig(scsi_changer *ch)
        } else {
                vprintk("reading element address assigment page failed!\n");
        }
-       
+
        /* vendor specific element types */
        for (i = 0; i < 4; i++) {
                if (0 == vendor_counts[i])
@@ -382,6 +354,12 @@ ch_readconfig(scsi_changer *ch)
        /* look up the devices of the data transfer elements */
        ch->dt = kmalloc(ch->counts[CHET_DT]*sizeof(struct scsi_device),
                         GFP_KERNEL);
+
+       if (!ch->dt) {
+               kfree(buffer);
+               return -ENOMEM;
+       }
+
        for (elem = 0; elem < ch->counts[CHET_DT]; elem++) {
                id  = -1;
                lun = 0;
@@ -443,7 +421,7 @@ static int
 ch_position(scsi_changer *ch, u_int trans, u_int elem, int rotate)
 {
        u_char  cmd[10];
-       
+
        dprintk("position: 0x%x\n",elem);
        if (0 == trans)
                trans = ch->firsts[CHET_MT];
@@ -462,7 +440,7 @@ static int
 ch_move(scsi_changer *ch, u_int trans, u_int src, u_int dest, int rotate)
 {
        u_char  cmd[12];
-       
+
        dprintk("move: 0x%x => 0x%x\n",src,dest);
        if (0 == trans)
                trans = ch->firsts[CHET_MT];
@@ -484,7 +462,7 @@ ch_exchange(scsi_changer *ch, u_int trans, u_int src,
            u_int dest1, u_int dest2, int rotate1, int rotate2)
 {
        u_char  cmd[12];
-       
+
        dprintk("exchange: 0x%x => 0x%x => 0x%x\n",
                src,dest1,dest2);
        if (0 == trans)
@@ -501,7 +479,7 @@ ch_exchange(scsi_changer *ch, u_int trans, u_int src,
        cmd[8]  = (dest2 >> 8) & 0xff;
        cmd[9]  =  dest2       & 0xff;
        cmd[10] = (rotate1 ? 1 : 0) | (rotate2 ? 2 : 0);
-       
+
        return ch_do_scsi(ch, cmd, NULL,0, DMA_NONE);
 }
 
@@ -539,14 +517,14 @@ ch_set_voltag(scsi_changer *ch, u_int elem,
                elem, tag);
        memset(cmd,0,sizeof(cmd));
        cmd[0]  = SEND_VOLUME_TAG;
-       cmd[1] = (ch->device->lun << 5) | 
+       cmd[1] = (ch->device->lun << 5) |
                ch_elem_to_typecode(ch,elem);
        cmd[2] = (elem >> 8) & 0xff;
        cmd[3] = elem        & 0xff;
        cmd[5] = clear
                ? (alternate ? 0x0d : 0x0c)
                : (alternate ? 0x0b : 0x0a);
-       
+
        cmd[9] = 255;
 
        memcpy(buffer,tag,32);
@@ -562,7 +540,7 @@ static int ch_gstatus(scsi_changer *ch, int type, unsigned char __user *dest)
        int retval = 0;
        u_char data[16];
        unsigned int i;
-       
+
        mutex_lock(&ch->lock);
        for (i = 0; i < ch->counts[type]; i++) {
                if (0 != ch_read_element_status
@@ -602,16 +580,19 @@ ch_open(struct inode *inode, struct file *file)
        scsi_changer *ch;
        int minor = iminor(inode);
 
+       lock_kernel();
        spin_lock(&ch_index_lock);
        ch = idr_find(&ch_index_idr, minor);
 
        if (NULL == ch || scsi_device_get(ch->device)) {
                spin_unlock(&ch_index_lock);
+               unlock_kernel();
                return -ENXIO;
        }
        spin_unlock(&ch_index_lock);
 
        file->private_data = ch;
+       unlock_kernel();
        return 0;
 }
 
@@ -629,18 +610,18 @@ static long ch_ioctl(struct file *file,
        scsi_changer *ch = file->private_data;
        int retval;
        void __user *argp = (void __user *)arg;
-       
+
        switch (cmd) {
        case CHIOGPARAMS:
        {
                struct changer_params params;
-               
+
                params.cp_curpicker = 0;
                params.cp_npickers  = ch->counts[CHET_MT];
                params.cp_nslots    = ch->counts[CHET_ST];
                params.cp_nportals  = ch->counts[CHET_IE];
                params.cp_ndrives   = ch->counts[CHET_DT];
-               
+
                if (copy_to_user(argp, &params, sizeof(params)))
                        return -EFAULT;
                return 0;
@@ -670,11 +651,11 @@ static long ch_ioctl(struct file *file,
                        return -EFAULT;
                return 0;
        }
-       
+
        case CHIOPOSITION:
        {
                struct changer_position pos;
-               
+
                if (copy_from_user(&pos, argp, sizeof (pos)))
                        return -EFAULT;
 
@@ -689,7 +670,7 @@ static long ch_ioctl(struct file *file,
                mutex_unlock(&ch->lock);
                return retval;
        }
-       
+
        case CHIOMOVE:
        {
                struct changer_move mv;
@@ -702,7 +683,7 @@ static long ch_ioctl(struct file *file,
                        dprintk("CHIOMOVE: invalid parameter\n");
                        return -EBADSLT;
                }
-               
+
                mutex_lock(&ch->lock);
                retval = ch_move(ch,0,
                                 ch->firsts[mv.cm_fromtype] + mv.cm_fromunit,
@@ -715,7 +696,7 @@ static long ch_ioctl(struct file *file,
        case CHIOEXCHANGE:
        {
                struct changer_exchange mv;
-               
+
                if (copy_from_user(&mv, argp, sizeof (mv)))
                        return -EFAULT;
 
@@ -725,7 +706,7 @@ static long ch_ioctl(struct file *file,
                        dprintk("CHIOEXCHANGE: invalid parameter\n");
                        return -EBADSLT;
                }
-               
+
                mutex_lock(&ch->lock);
                retval = ch_exchange
                        (ch,0,
@@ -740,7 +721,7 @@ static long ch_ioctl(struct file *file,
        case CHIOGSTATUS:
        {
                struct changer_element_status ces;
-               
+
                if (copy_from_user(&ces, argp, sizeof (ces)))
                        return -EFAULT;
                if (ces.ces_type < 0 || ces.ces_type >= CH_TYPES)
@@ -752,35 +733,36 @@ static long ch_ioctl(struct file *file,
        case CHIOGELEM:
        {
                struct changer_get_element cge;
-               u_char  cmd[12];
-               u_char  *buffer;
+               u_char ch_cmd[12];
+               u_char *buffer;
                unsigned int elem;
                int     result,i;
-               
+
                if (copy_from_user(&cge, argp, sizeof (cge)))
                        return -EFAULT;
 
                if (0 != ch_checkrange(ch, cge.cge_type, cge.cge_unit))
                        return -EINVAL;
                elem = ch->firsts[cge.cge_type] + cge.cge_unit;
-               
+
                buffer = kmalloc(512, GFP_KERNEL | GFP_DMA);
                if (!buffer)
                        return -ENOMEM;
                mutex_lock(&ch->lock);
-               
+
        voltag_retry:
-               memset(cmd,0,sizeof(cmd));
-               cmd[0] = READ_ELEMENT_STATUS;
-               cmd[1] = (ch->device->lun << 5) |
+               memset(ch_cmd, 0, sizeof(ch_cmd));
+               ch_cmd[0] = READ_ELEMENT_STATUS;
+               ch_cmd[1] = (ch->device->lun << 5) |
                        (ch->voltags ? 0x10 : 0) |
                        ch_elem_to_typecode(ch,elem);
-               cmd[2] = (elem >> 8) & 0xff;
-               cmd[3] = elem        & 0xff;
-               cmd[5] = 1;
-               cmd[9] = 255;
-               
-               if (0 == (result = ch_do_scsi(ch, cmd, buffer, 256, DMA_FROM_DEVICE))) {
+               ch_cmd[2] = (elem >> 8) & 0xff;
+               ch_cmd[3] = elem        & 0xff;
+               ch_cmd[5] = 1;
+               ch_cmd[9] = 255;
+
+               result = ch_do_scsi(ch, ch_cmd, buffer, 256, DMA_FROM_DEVICE);
+               if (!result) {
                        cge.cge_status = buffer[18];
                        cge.cge_flags = 0;
                        if (buffer[18] & CESTATUS_EXCEPT) {
@@ -819,7 +801,7 @@ static long ch_ioctl(struct file *file,
                }
                kfree(buffer);
                mutex_unlock(&ch->lock);
-               
+
                if (copy_to_user(argp, &cge, sizeof (cge)))
                        return -EFAULT;
                return result;
@@ -832,7 +814,7 @@ static long ch_ioctl(struct file *file,
                mutex_unlock(&ch->lock);
                return retval;
        }
-               
+
        case CHIOSVOLTAG:
        {
                struct changer_set_voltag csv;
@@ -873,7 +855,7 @@ static long ch_ioctl_compat(struct file * file,
                            unsigned int cmd, unsigned long arg)
 {
        scsi_changer *ch = file->private_data;
-       
+
        switch (cmd) {
        case CHIOGPARAMS:
        case CHIOGVPARAMS:
@@ -889,7 +871,7 @@ static long ch_ioctl_compat(struct file * file,
        {
                struct changer_element_status32 ces32;
                unsigned char __user *data;
-               
+
                if (copy_from_user(&ces32, (void __user *)arg, sizeof (ces32)))
                        return -EFAULT;
                if (ces32.ces_type < 0 || ces32.ces_type >= CH_TYPES)
@@ -911,7 +893,7 @@ static long ch_ioctl_compat(struct file * file,
 static int ch_probe(struct device *dev)
 {
        struct scsi_device *sd = to_scsi_device(dev);
-       struct class_device *class_dev;
+       struct device *class_dev;
        int minor, ret = -ENOMEM;
        scsi_changer *ch;
 
@@ -940,11 +922,11 @@ static int ch_probe(struct device *dev)
        ch->minor = minor;
        sprintf(ch->name,"ch%d",ch->minor);
 
-       class_dev = class_device_create(ch_sysfs_class, NULL,
-                                       MKDEV(SCSI_CHANGER_MAJOR, ch->minor),
-                                       dev, "s%s", ch->name);
+       class_dev = device_create(ch_sysfs_class, dev,
+                                 MKDEV(SCSI_CHANGER_MAJOR, ch->minor), ch,
+                                 "s%s", ch->name);
        if (IS_ERR(class_dev)) {
-               printk(KERN_WARNING "ch%d: class_device_create failed\n",
+               printk(KERN_WARNING "ch%d: device_create failed\n",
                       ch->minor);
                ret = PTR_ERR(class_dev);
                goto remove_idr;
@@ -975,17 +957,35 @@ static int ch_remove(struct device *dev)
        idr_remove(&ch_index_idr, ch->minor);
        spin_unlock(&ch_index_lock);
 
-       class_device_destroy(ch_sysfs_class,
-                            MKDEV(SCSI_CHANGER_MAJOR,ch->minor));
+       device_destroy(ch_sysfs_class, MKDEV(SCSI_CHANGER_MAJOR,ch->minor));
        kfree(ch->dt);
        kfree(ch);
        return 0;
 }
 
+static struct scsi_driver ch_template = {
+       .owner          = THIS_MODULE,
+       .gendrv         = {
+               .name   = "ch",
+               .probe  = ch_probe,
+               .remove = ch_remove,
+       },
+};
+
+static const struct file_operations changer_fops = {
+       .owner          = THIS_MODULE,
+       .open           = ch_open,
+       .release        = ch_release,
+       .unlocked_ioctl = ch_ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl   = ch_ioctl_compat,
+#endif
+};
+
 static int __init init_ch_module(void)
 {
        int rc;
-       
+
        printk(KERN_INFO "SCSI Media Changer driver v" VERSION " \n");
         ch_sysfs_class = class_create(THIS_MODULE, "scsi_changer");
         if (IS_ERR(ch_sysfs_class)) {
@@ -1010,7 +1010,7 @@ static int __init init_ch_module(void)
        return rc;
 }
 
-static void __exit exit_ch_module(void) 
+static void __exit exit_ch_module(void)
 {
        scsi_unregister_driver(&ch_template.gendrv);
        unregister_chrdev(SCSI_CHANGER_MAJOR, "ch");