Commit 8ce3eca4 authored by Salyzyn, Mark's avatar Salyzyn, Mark Committed by James Bottomley

[SCSI] aacraid: remove pigs in space

I was amazed at how much embedded space was present in the aacraid
driver source files. Just selected five files from the set to clean up
for now and the attached patch swelled to 73K in size!

- Removed trailing space or tabs
- Removed spaces embedded within tabs
- Replaced leading 8 spaces with tabs
- Removed spaces before )
- Removed ClusterCommand as it was unused (noticed it as one triggered by above)
- Replaced scsi_status comparison with 0x02, to compare against SAM_STATUS_CHECK_CONDITION.
- Replaced a long series of spaces with tabs
- Replaced some simple if...defined() with ifdef/ifndef
Signed-off-by: default avatarMark Salyzyn <aacraid@adaptec.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent d07e0361
...@@ -196,7 +196,7 @@ static inline int aac_valid_context(struct scsi_cmnd *scsicmd, ...@@ -196,7 +196,7 @@ static inline int aac_valid_context(struct scsi_cmnd *scsicmd,
struct fib *fibptr) { struct fib *fibptr) {
struct scsi_device *device; struct scsi_device *device;
if (unlikely(!scsicmd || !scsicmd->scsi_done )) { if (unlikely(!scsicmd || !scsicmd->scsi_done)) {
dprintk((KERN_WARNING "aac_valid_context: scsi command corrupt\n")); dprintk((KERN_WARNING "aac_valid_context: scsi command corrupt\n"));
aac_fib_complete(fibptr); aac_fib_complete(fibptr);
aac_fib_free(fibptr); aac_fib_free(fibptr);
...@@ -243,7 +243,7 @@ int aac_get_config_status(struct aac_dev *dev, int commit_flag) ...@@ -243,7 +243,7 @@ int aac_get_config_status(struct aac_dev *dev, int commit_flag)
FsaNormal, FsaNormal,
1, 1, 1, 1,
NULL, NULL); NULL, NULL);
if (status < 0 ) { if (status < 0) {
printk(KERN_WARNING "aac_get_config_status: SendFIB failed.\n"); printk(KERN_WARNING "aac_get_config_status: SendFIB failed.\n");
} else { } else {
struct aac_get_config_status_resp *reply struct aac_get_config_status_resp *reply
...@@ -439,7 +439,7 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd) ...@@ -439,7 +439,7 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd)
sizeof (struct aac_get_name), sizeof (struct aac_get_name),
FsaNormal, FsaNormal,
0, 1, 0, 1,
(fib_callback) get_container_name_callback, (fib_callback)get_container_name_callback,
(void *) scsicmd); (void *) scsicmd);
/* /*
...@@ -663,7 +663,7 @@ struct scsi_inq { ...@@ -663,7 +663,7 @@ struct scsi_inq {
static void inqstrcpy(char *a, char *b) static void inqstrcpy(char *a, char *b)
{ {
while(*a != (char)0) while (*a != (char)0)
*b++ = *a++; *b++ = *a++;
} }
...@@ -1963,7 +1963,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd) ...@@ -1963,7 +1963,7 @@ int aac_scsi_cmd(struct scsi_cmnd * scsicmd)
dprintk((KERN_DEBUG "INQUIRY command, ID: %d.\n", cid)); dprintk((KERN_DEBUG "INQUIRY command, ID: %d.\n", cid));
memset(&inq_data, 0, sizeof (struct inquiry_data)); memset(&inq_data, 0, sizeof (struct inquiry_data));
if (scsicmd->cmnd[1] & 0x1 ) { if (scsicmd->cmnd[1] & 0x1) {
char *arr = (char *)&inq_data; char *arr = (char *)&inq_data;
/* EVPD bit set */ /* EVPD bit set */
...@@ -2442,7 +2442,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr) ...@@ -2442,7 +2442,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
case WRITE_12: case WRITE_12:
case READ_16: case READ_16:
case WRITE_16: case WRITE_16:
if(le32_to_cpu(srbreply->data_xfer_length) < scsicmd->underflow ) { if (le32_to_cpu(srbreply->data_xfer_length) < scsicmd->underflow) {
printk(KERN_WARNING"aacraid: SCSI CMD underflow\n"); printk(KERN_WARNING"aacraid: SCSI CMD underflow\n");
} else { } else {
printk(KERN_WARNING"aacraid: SCSI CMD Data Overrun\n"); printk(KERN_WARNING"aacraid: SCSI CMD Data Overrun\n");
...@@ -2518,7 +2518,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr) ...@@ -2518,7 +2518,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
scsicmd->result = DID_ERROR << 16 | COMMAND_COMPLETE << 8; scsicmd->result = DID_ERROR << 16 | COMMAND_COMPLETE << 8;
break; break;
} }
if (le32_to_cpu(srbreply->scsi_status) == 0x02 ){ // Check Condition if (le32_to_cpu(srbreply->scsi_status) == SAM_STAT_CHECK_CONDITION) {
int len; int len;
scsicmd->result |= SAM_STAT_CHECK_CONDITION; scsicmd->result |= SAM_STAT_CHECK_CONDITION;
len = min_t(u32, le32_to_cpu(srbreply->sense_data_size), len = min_t(u32, le32_to_cpu(srbreply->sense_data_size),
...@@ -2528,7 +2528,6 @@ static void aac_srb_callback(void *context, struct fib * fibptr) ...@@ -2528,7 +2528,6 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
le32_to_cpu(srbreply->status), len); le32_to_cpu(srbreply->status), len);
#endif #endif
memcpy(scsicmd->sense_buffer, srbreply->sense_data, len); memcpy(scsicmd->sense_buffer, srbreply->sense_data, len);
} }
/* /*
* OR in the scsi status (already shifted up a bit) * OR in the scsi status (already shifted up a bit)
......
#if (!defined(dprintk)) #ifndef dprintk
# define dprintk(x) # define dprintk(x)
#endif #endif
/* eg: if (nblank(dprintk(x))) */ /* eg: if (nblank(dprintk(x))) */
...@@ -349,10 +349,6 @@ struct hw_fib { ...@@ -349,10 +349,6 @@ struct hw_fib {
#define ContainerCommand 500 #define ContainerCommand 500
#define ContainerCommand64 501 #define ContainerCommand64 501
#define ContainerRawIo 502 #define ContainerRawIo 502
/*
* Cluster Commands
*/
#define ClusterCommand 550
/* /*
* Scsi Port commands (scsi passthrough) * Scsi Port commands (scsi passthrough)
*/ */
...@@ -994,7 +990,7 @@ struct aac_dev ...@@ -994,7 +990,7 @@ struct aac_dev
/* /*
* The following is the device specific extension. * The following is the device specific extension.
*/ */
#if (!defined(AAC_MIN_FOOTPRINT_SIZE)) #ifndef AAC_MIN_FOOTPRINT_SIZE
# define AAC_MIN_FOOTPRINT_SIZE 8192 # define AAC_MIN_FOOTPRINT_SIZE 8192
#endif #endif
union union
......
...@@ -430,7 +430,7 @@ static int check_revision(struct aac_dev *dev, void __user *arg) ...@@ -430,7 +430,7 @@ static int check_revision(struct aac_dev *dev, void __user *arg)
version += simple_strtol(driver_version + 1, &driver_version, 10) << 16; version += simple_strtol(driver_version + 1, &driver_version, 10) << 16;
version += simple_strtol(driver_version + 1, NULL, 10); version += simple_strtol(driver_version + 1, NULL, 10);
response.version = cpu_to_le32(version); response.version = cpu_to_le32(version);
# if (defined(AAC_DRIVER_BUILD)) # ifdef AAC_DRIVER_BUILD
response.build = cpu_to_le32(AAC_DRIVER_BUILD); response.build = cpu_to_le32(AAC_DRIVER_BUILD);
# else # else
response.build = cpu_to_le32(9999); response.build = cpu_to_le32(9999);
...@@ -593,7 +593,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) ...@@ -593,7 +593,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
sg_list[i] = p; // save so we can clean up later sg_list[i] = p; // save so we can clean up later
sg_indx = i; sg_indx = i;
if( flags & SRB_DataOut ){ if (flags & SRB_DataOut) {
if(copy_from_user(p,sg_user[i],upsg->sg[i].count)){ if(copy_from_user(p,sg_user[i],upsg->sg[i].count)){
dprintk((KERN_DEBUG"aacraid: Could not copy sg data from user\n")); dprintk((KERN_DEBUG"aacraid: Could not copy sg data from user\n"));
rcode = -EFAULT; rcode = -EFAULT;
...@@ -636,7 +636,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) ...@@ -636,7 +636,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
sg_list[i] = p; // save so we can clean up later sg_list[i] = p; // save so we can clean up later
sg_indx = i; sg_indx = i;
if( flags & SRB_DataOut ){ if (flags & SRB_DataOut) {
if(copy_from_user(p,sg_user[i],upsg->sg[i].count)){ if(copy_from_user(p,sg_user[i],upsg->sg[i].count)){
kfree (usg); kfree (usg);
dprintk((KERN_DEBUG"aacraid: Could not copy sg data from user\n")); dprintk((KERN_DEBUG"aacraid: Could not copy sg data from user\n"));
...@@ -679,7 +679,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) ...@@ -679,7 +679,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
sg_list[i] = p; // save so we can clean up later sg_list[i] = p; // save so we can clean up later
sg_indx = i; sg_indx = i;
if( flags & SRB_DataOut ){ if (flags & SRB_DataOut) {
if(copy_from_user(p,sg_user[i],usg->sg[i].count)){ if(copy_from_user(p,sg_user[i],usg->sg[i].count)){
dprintk((KERN_DEBUG"aacraid: Could not copy sg data from user\n")); dprintk((KERN_DEBUG"aacraid: Could not copy sg data from user\n"));
rcode = -EFAULT; rcode = -EFAULT;
...@@ -707,7 +707,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) ...@@ -707,7 +707,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
sg_list[i] = p; // save so we can clean up later sg_list[i] = p; // save so we can clean up later
sg_indx = i; sg_indx = i;
if( flags & SRB_DataOut ){ if (flags & SRB_DataOut) {
if(copy_from_user(p, sg_user[i], if(copy_from_user(p, sg_user[i],
upsg->sg[i].count)) { upsg->sg[i].count)) {
dprintk((KERN_DEBUG"aacraid: Could not copy sg data from user\n")); dprintk((KERN_DEBUG"aacraid: Could not copy sg data from user\n"));
...@@ -738,7 +738,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg) ...@@ -738,7 +738,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
goto cleanup; goto cleanup;
} }
if( flags & SRB_DataIn ) { if (flags & SRB_DataIn) {
for(i = 0 ; i <= sg_indx; i++){ for(i = 0 ; i <= sg_indx; i++){
byte_count = le32_to_cpu( byte_count = le32_to_cpu(
(dev->adapter_info.options & AAC_OPT_SGMAP_HOST64) (dev->adapter_info.options & AAC_OPT_SGMAP_HOST64)
......
...@@ -116,7 +116,9 @@ int aac_fib_setup(struct aac_dev * dev) ...@@ -116,7 +116,9 @@ int aac_fib_setup(struct aac_dev * dev)
/* /*
* Initialise the fibs * Initialise the fibs
*/ */
for (i = 0, fibptr = &dev->fibs[i]; i < (dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB); i++, fibptr++) for (i = 0, fibptr = &dev->fibs[i];
i < (dev->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB);
i++, fibptr++)
{ {
fibptr->dev = dev; fibptr->dev = dev;
fibptr->hw_fib_va = hw_fib; fibptr->hw_fib_va = hw_fib;
...@@ -291,7 +293,8 @@ static int aac_get_entry (struct aac_dev * dev, u32 qid, struct aac_entry **entr ...@@ -291,7 +293,8 @@ static int aac_get_entry (struct aac_dev * dev, u32 qid, struct aac_entry **entr
*index = 0; /* Wrap to front of the Producer Queue. */ *index = 0; /* Wrap to front of the Producer Queue. */
} }
if ((*index + 1) == le32_to_cpu(*(q->headers.consumer))) { /* Queue is full */ /* Queue is full */
if ((*index + 1) == le32_to_cpu(*(q->headers.consumer))) {
printk(KERN_WARNING "Queue %d full, %u outstanding.\n", printk(KERN_WARNING "Queue %d full, %u outstanding.\n",
qid, q->numpending); qid, q->numpending);
return 0; return 0;
...@@ -324,8 +327,7 @@ int aac_queue_get(struct aac_dev * dev, u32 * index, u32 qid, struct hw_fib * hw ...@@ -324,8 +327,7 @@ int aac_queue_get(struct aac_dev * dev, u32 * index, u32 qid, struct hw_fib * hw
if (qid == AdapNormCmdQueue) { if (qid == AdapNormCmdQueue) {
/* if no entries wait for some if caller wants to */ /* if no entries wait for some if caller wants to */
while (!aac_get_entry(dev, qid, &entry, index, nonotify)) while (!aac_get_entry(dev, qid, &entry, index, nonotify)) {
{
printk(KERN_ERR "GetEntries failed\n"); printk(KERN_ERR "GetEntries failed\n");
} }
/* /*
...@@ -334,8 +336,7 @@ int aac_queue_get(struct aac_dev * dev, u32 * index, u32 qid, struct hw_fib * hw ...@@ -334,8 +336,7 @@ int aac_queue_get(struct aac_dev * dev, u32 * index, u32 qid, struct hw_fib * hw
entry->size = cpu_to_le32(le16_to_cpu(hw_fib->header.Size)); entry->size = cpu_to_le32(le16_to_cpu(hw_fib->header.Size));
map = 1; map = 1;
} else { } else {
while(!aac_get_entry(dev, qid, &entry, index, nonotify)) while (!aac_get_entry(dev, qid, &entry, index, nonotify)) {
{
/* if no entries wait for some if caller wants to */ /* if no entries wait for some if caller wants to */
} }
/* /*
...@@ -637,7 +638,7 @@ int aac_fib_adapter_complete(struct fib *fibptr, unsigned short size) ...@@ -637,7 +638,7 @@ int aac_fib_adapter_complete(struct fib *fibptr, unsigned short size)
/* /*
* If we plan to do anything check the structure type first. * If we plan to do anything check the structure type first.
*/ */
if ( hw_fib->header.StructType != FIB_MAGIC ) { if (hw_fib->header.StructType != FIB_MAGIC) {
if (dev->comm_interface == AAC_COMM_MESSAGE) if (dev->comm_interface == AAC_COMM_MESSAGE)
kfree (hw_fib); kfree (hw_fib);
return -EINVAL; return -EINVAL;
...@@ -669,10 +670,9 @@ int aac_fib_adapter_complete(struct fib *fibptr, unsigned short size) ...@@ -669,10 +670,9 @@ int aac_fib_adapter_complete(struct fib *fibptr, unsigned short size)
if (!(nointr & (int)aac_config.irq_mod)) if (!(nointr & (int)aac_config.irq_mod))
aac_adapter_notify(dev, AdapNormRespQueue); aac_adapter_notify(dev, AdapNormRespQueue);
} }
} } else {
else printk(KERN_WARNING "aac_fib_adapter_complete: "
{ "Unknown xferstate detected.\n");
printk(KERN_WARNING "aac_fib_adapter_complete: Unknown xferstate detected.\n");
BUG(); BUG();
} }
return 0; return 0;
...@@ -1487,8 +1487,7 @@ int aac_command_thread(void *data) ...@@ -1487,8 +1487,7 @@ int aac_command_thread(void *data)
add_wait_queue(&dev->queues->queue[HostNormCmdQueue].cmdready, &wait); add_wait_queue(&dev->queues->queue[HostNormCmdQueue].cmdready, &wait);
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
dprintk ((KERN_INFO "aac_command_thread start\n")); dprintk ((KERN_INFO "aac_command_thread start\n"));
while(1) while (1) {
{
spin_lock_irqsave(dev->queues->queue[HostNormCmdQueue].lock, flags); spin_lock_irqsave(dev->queues->queue[HostNormCmdQueue].lock, flags);
while(!list_empty(&(dev->queues->queue[HostNormCmdQueue].cmdq))) { while(!list_empty(&(dev->queues->queue[HostNormCmdQueue].cmdq))) {
struct list_head *entry; struct list_head *entry;
...@@ -1510,7 +1509,7 @@ int aac_command_thread(void *data) ...@@ -1510,7 +1509,7 @@ int aac_command_thread(void *data)
hw_fib = fib->hw_fib_va; hw_fib = fib->hw_fib_va;
memset(fib, 0, sizeof(struct fib)); memset(fib, 0, sizeof(struct fib));
fib->type = FSAFS_NTC_FIB_CONTEXT; fib->type = FSAFS_NTC_FIB_CONTEXT;
fib->size = sizeof( struct fib ); fib->size = sizeof(struct fib);
fib->hw_fib_va = hw_fib; fib->hw_fib_va = hw_fib;
fib->data = hw_fib->data; fib->data = hw_fib->data;
fib->dev = dev; fib->dev = dev;
......
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