Skip to content

Commit

Permalink
[SCSI] aacraid: misc cleanup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Haverkamp authored and James Bottomley committed Sep 24, 2006
1 parent 9cbb889 commit 6510135
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
8 changes: 4 additions & 4 deletions drivers/scsi/aacraid/aachba.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
1 change: 0 additions & 1 deletion drivers/scsi/aacraid/aacraid.h
Original file line number Diff line number Diff line change
Expand Up @@ -1525,7 +1525,6 @@ struct aac_get_name {
__le32 count; /* sizeof(((struct aac_get_name_resp *)NULL)->data) */
};

#define CT_OK 218
struct aac_get_name_resp {
__le32 dummy0;
__le32 dummy1;
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/aacraid/commsup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));

if (!dev->queues)
return -ENODEV;
return -EBUSY;
q = &dev->queues->queue[AdapNormCmdQueue];

if(wait)
Expand Down

0 comments on commit 6510135

Please sign in to comment.