[PATCH] 3ware 5/6/7/8000 driver update

- Make tw_check_bits() static.
- Add MODULE_VERSION support.
- Fix ioctl path to use dma_alloc/free_coherent() instead of
  pci_alloc/free_consistent().
- Remove error variable from ioctl code causing confusion.
  retval defaults to -EFAULT, any copy_to/from_user() that
  returns non zero returns -EFAULT.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 05edf228e5ea185add6a9be853831a4bd3aa419b..7c19c72a00203c7038bd1951b0ada3d91d05fb01 100644 (file)
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -207,7 +207,7 @@
 #include "3w-xxxx.h"
 
 /* Globals */
-static const char *tw_driver_version="1.26.02.000";
+#define TW_DRIVER_VERSION "1.26.02.000"
 static TW_Device_Extension *tw_device_extension_list[TW_MAX_SLOT];
 static int tw_device_extension_count = 0;
 static int twe_major = -1;
@@ -216,6 +216,7 @@ static int twe_major = -1;
 MODULE_AUTHOR("AMCC");
 MODULE_DESCRIPTION("3ware Storage Controller Linux Driver");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(TW_DRIVER_VERSION);
 
 /* Function prototypes */
 static int tw_reset_device_extension(TW_Device_Extension *tw_dev, int ioctl_reset);
@@ -223,7 +224,7 @@ static int tw_reset_device_extension(TW_Device_Extension *tw_dev, int ioctl_rese
 /* Functions */
 
 /* This function will check the status register for unexpected bits */
-int tw_check_bits(u32 status_reg_value)
+static int tw_check_bits(u32 status_reg_value)
 {
        if ((status_reg_value & TW_STATUS_EXPECTED_BITS) != TW_STATUS_EXPECTED_BITS) {  
                dprintk(KERN_WARNING "3w-xxxx: tw_check_bits(): No expected bits (0x%x).\n", status_reg_value);
@@ -492,7 +493,7 @@ static ssize_t tw_show_stats(struct class_device *class_dev, char *buf)
                       "Max sector count:          %4d\n"
                       "SCSI Host Resets:          %4d\n"
                       "AEN's:                     %4d\n", 
-                      tw_driver_version,
+                      TW_DRIVER_VERSION,
                       tw_dev->posted_request_count,
                       tw_dev->max_posted_request_count,
                       tw_dev->pending_request_count,
@@ -884,7 +885,7 @@ static int tw_allocate_memory(TW_Device_Extension *tw_dev, int size, int which)
 /* This function handles ioctl for the character device */
 static int tw_chrdev_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
 {
-       int error, request_id;
+       int request_id;
        dma_addr_t dma_handle;
        unsigned short tw_aen_code;
        unsigned long flags;
@@ -905,8 +906,7 @@ static int tw_chrdev_ioctl(struct inode *inode, struct file *file, unsigned int
                return -EINTR;
 
        /* First copy down the buffer length */
-       error = copy_from_user(&data_buffer_length, argp, sizeof(unsigned int));
-       if (error)
+       if (copy_from_user(&data_buffer_length, argp, sizeof(unsigned int)))
                goto out;
 
        /* Check size */
@@ -919,7 +919,7 @@ static int tw_chrdev_ioctl(struct inode *inode, struct file *file, unsigned int
        data_buffer_length_adjusted = (data_buffer_length + 511) & ~511;
        
        /* Now allocate ioctl buf memory */
-       cpu_addr = pci_alloc_consistent(tw_dev->tw_pci_dev, data_buffer_length_adjusted+sizeof(TW_New_Ioctl) - 1, &dma_handle);
+       cpu_addr = dma_alloc_coherent(&tw_dev->tw_pci_dev->dev, data_buffer_length_adjusted+sizeof(TW_New_Ioctl) - 1, &dma_handle, GFP_KERNEL);
        if (cpu_addr == NULL) {
                retval = -ENOMEM;
                goto out;
@@ -928,8 +928,7 @@ static int tw_chrdev_ioctl(struct inode *inode, struct file *file, unsigned int
        tw_ioctl = (TW_New_Ioctl *)cpu_addr;
 
        /* Now copy down the entire ioctl */
-       error = copy_from_user(tw_ioctl, argp, data_buffer_length + sizeof(TW_New_Ioctl) - 1);
-       if (error)
+       if (copy_from_user(tw_ioctl, argp, data_buffer_length + sizeof(TW_New_Ioctl) - 1))
                goto out2;
 
        passthru = (TW_Passthru *)&tw_ioctl->firmware_command;
@@ -1042,12 +1041,12 @@ static int tw_chrdev_ioctl(struct inode *inode, struct file *file, unsigned int
        }
 
        /* Now copy the response to userspace */
-       error = copy_to_user(argp, tw_ioctl, sizeof(TW_New_Ioctl) + data_buffer_length - 1);
-       if (error == 0)
-               retval = 0;
+       if (copy_to_user(argp, tw_ioctl, sizeof(TW_New_Ioctl) + data_buffer_length - 1))
+               goto out2;
+       retval = 0;
 out2:
        /* Now free ioctl buf memory */
-       pci_free_consistent(tw_dev->tw_pci_dev, data_buffer_length_adjusted+sizeof(TW_New_Ioctl) - 1, cpu_addr, dma_handle);
+       dma_free_coherent(&tw_dev->tw_pci_dev->dev, data_buffer_length_adjusted+sizeof(TW_New_Ioctl) - 1, cpu_addr, dma_handle);
 out:
        up(&tw_dev->ioctl_sem);
        return retval;
@@ -1544,7 +1543,7 @@ static int tw_scsiop_inquiry_complete(TW_Device_Extension *tw_dev, int request_i
        request_buffer[4] = 31;        /* Additional length */
        memcpy(&request_buffer[8], "3ware   ", 8);       /* Vendor ID */
        sprintf(&request_buffer[16], "Logical Disk %-2d ", tw_dev->srb[request_id]->device->id);
-       memcpy(&request_buffer[32], tw_driver_version, 3);
+       memcpy(&request_buffer[32], TW_DRIVER_VERSION, 3);
 
        param = (TW_Param *)tw_dev->alignment_virtual_address[request_id];
        if (param == NULL) {
@@ -2484,7 +2483,7 @@ static struct pci_driver tw_driver = {
 /* This function is called on driver initialization */
 static int __init tw_init(void)
 {
-       printk(KERN_WARNING "3ware Storage Controller device driver for Linux v%s.\n", tw_driver_version);
+       printk(KERN_WARNING "3ware Storage Controller device driver for Linux v%s.\n", TW_DRIVER_VERSION);
 
        return pci_module_init(&tw_driver);
 } /* End tw_init() */