Commit 65101355 authored by Mark Haverkamp's avatar Mark Haverkamp Committed by James Bottomley

[SCSI] aacraid: misc cleanup

Received from Mark Salyzyn:

Basically cleanup, nothing here will have an affect. Adjusting some
error codes, removing superfluous definitions and code fragments.
Signed-off-by: default avatarMark Haverkamp <markh@osdl.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 9cbb8897
...@@ -1803,7 +1803,7 @@ static int query_disk(struct aac_dev *dev, void __user *arg) ...@@ -1803,7 +1803,7 @@ static int query_disk(struct aac_dev *dev, void __user *arg)
fsa_dev_ptr = dev->fsa_dev; fsa_dev_ptr = dev->fsa_dev;
if (!fsa_dev_ptr) if (!fsa_dev_ptr)
return -ENODEV; return -EBUSY;
if (copy_from_user(&qd, arg, sizeof (struct aac_query_disk))) if (copy_from_user(&qd, arg, sizeof (struct aac_query_disk)))
return -EFAULT; return -EFAULT;
if (qd.cnum == -1) if (qd.cnum == -1)
...@@ -1842,6 +1842,8 @@ static int force_delete_disk(struct aac_dev *dev, void __user *arg) ...@@ -1842,6 +1842,8 @@ static int force_delete_disk(struct aac_dev *dev, void __user *arg)
struct fsa_dev_info *fsa_dev_ptr; struct fsa_dev_info *fsa_dev_ptr;
fsa_dev_ptr = dev->fsa_dev; fsa_dev_ptr = dev->fsa_dev;
if (!fsa_dev_ptr)
return -EBUSY;
if (copy_from_user(&dd, arg, sizeof (struct aac_delete_disk))) if (copy_from_user(&dd, arg, sizeof (struct aac_delete_disk)))
return -EFAULT; return -EFAULT;
...@@ -1866,9 +1868,7 @@ static int delete_disk(struct aac_dev *dev, void __user *arg) ...@@ -1866,9 +1868,7 @@ static int delete_disk(struct aac_dev *dev, void __user *arg)
fsa_dev_ptr = dev->fsa_dev; fsa_dev_ptr = dev->fsa_dev;
if (!fsa_dev_ptr) if (!fsa_dev_ptr)
return -ENODEV; return -EBUSY;
if (!fsa_dev_ptr)
return -ENODEV;
if (copy_from_user(&dd, arg, sizeof (struct aac_delete_disk))) if (copy_from_user(&dd, arg, sizeof (struct aac_delete_disk)))
return -EFAULT; return -EFAULT;
......
...@@ -1525,7 +1525,6 @@ struct aac_get_name { ...@@ -1525,7 +1525,6 @@ struct aac_get_name {
__le32 count; /* sizeof(((struct aac_get_name_resp *)NULL)->data) */ __le32 count; /* sizeof(((struct aac_get_name_resp *)NULL)->data) */
}; };
#define CT_OK 218
struct aac_get_name_resp { struct aac_get_name_resp {
__le32 dummy0; __le32 dummy0;
__le32 dummy1; __le32 dummy1;
......
...@@ -467,7 +467,7 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size, ...@@ -467,7 +467,7 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
dprintk((KERN_DEBUG " fib being sent=%p\n",fibptr)); dprintk((KERN_DEBUG " fib being sent=%p\n",fibptr));
if (!dev->queues) if (!dev->queues)
return -ENODEV; return -EBUSY;
q = &dev->queues->queue[AdapNormCmdQueue]; q = &dev->queues->queue[AdapNormCmdQueue];
if(wait) if(wait)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment