[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: Mark Haverkamp <markh@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 37c55ddce214..b14f7cac30e9 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -1803,7 +1803,7 @@ static int query_disk(struct aac_dev *dev, void __user *arg)
 
         fsa_dev_ptr = dev->fsa_dev;
         if (!fsa_dev_ptr)
-                return -ENODEV;
+                return -EBUSY;
         if (copy_from_user(&qd, arg, sizeof (struct aac_query_disk)))
                 return -EFAULT;
         if (qd.cnum == -1)
@@ -1842,6 +1842,8 @@ static int force_delete_disk(struct aac_dev *dev, void __user *arg)
         struct fsa_dev_info *fsa_dev_ptr;
 
         fsa_dev_ptr = dev->fsa_dev;
+        if (!fsa_dev_ptr)
+                return -EBUSY;
 
         if (copy_from_user(&dd, arg, sizeof (struct aac_delete_disk)))
                 return -EFAULT;
@@ -1866,9 +1868,7 @@ static int delete_disk(struct aac_dev *dev, void __user *arg)
 
         fsa_dev_ptr = dev->fsa_dev;
         if (!fsa_dev_ptr)
-                return -ENODEV;
-        if (!fsa_dev_ptr)
-                return -ENODEV;
+                return -EBUSY;
 
         if (copy_from_user(&dd, arg, sizeof (struct aac_delete_disk)))
                 return -EFAULT;