Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

drivers/scsi/aacraid/aachba.c

+121 −122
Original line number Diff line number Diff line
@@ -2518,7 +2518,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr) 
		scsicmd->result = DID_ERROR << 16 | COMMAND_COMPLETE << 8;

		break;

	}

	if (le32_to_cpu(srbreply->scsi_status) == 0x02 ){  // Check Condition

	if (le32_to_cpu(srbreply->scsi_status) == SAM_STAT_CHECK_CONDITION) {

		int len;

		scsicmd->result |= SAM_STAT_CHECK_CONDITION;

		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) 
					le32_to_cpu(srbreply->status), len);

#endif

		memcpy(scsicmd->sense_buffer, srbreply->sense_data, len);

		

	}

	/*

	 * OR in the scsi status (already shifted up a bit)

drivers/scsi/aacraid/aacraid.h

+153 −157
Original line number Diff line number Diff line 
#if (!defined(dprintk))

#ifndef dprintk

# define dprintk(x)

#endif

/* eg: if (nblank(dprintk(x))) */
@@ -349,10 +349,6 @@ struct hw_fib { 
#define		ContainerCommand		500

#define		ContainerCommand64		501

#define		ContainerRawIo			502

/*

 *	Cluster Commands

 */

#define		ClusterCommand	 		550

/*

 *	Scsi Port commands (scsi passthrough)

 */
@@ -994,7 +990,7 @@ struct aac_dev 
	/*

	 *	The following is the device specific extension.

	 */

#if (!defined(AAC_MIN_FOOTPRINT_SIZE))

#ifndef AAC_MIN_FOOTPRINT_SIZE

#	define AAC_MIN_FOOTPRINT_SIZE 8192

#endif

	union

drivers/scsi/aacraid/commctrl.c

+40 −40
Original line number Diff line number Diff line
@@ -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, NULL, 10);

	response.version = cpu_to_le32(version);

#	if (defined(AAC_DRIVER_BUILD))

#	ifdef AAC_DRIVER_BUILD

		response.build = cpu_to_le32(AAC_DRIVER_BUILD);

#	else

		response.build = cpu_to_le32(9999);

drivers/scsi/aacraid/commsup.c

+100 −101
Original line number Diff line number Diff line
@@ -116,7 +116,9 @@ int aac_fib_setup(struct aac_dev * dev) 
	/*

	 *	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->hw_fib_va = hw_fib;
@@ -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. */

	}



        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",

				qid, q->numpending);

		return 0;
@@ -324,8 +327,7 @@ int aac_queue_get(struct aac_dev * dev, u32 * index, u32 qid, struct hw_fib * hw 


	if (qid == AdapNormCmdQueue) {

		/*  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");

		}

		/*
@@ -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));

		map = 1;

	} 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 */

		}

		/*
@@ -669,10 +670,9 @@ int aac_fib_adapter_complete(struct fib *fibptr, unsigned short size) 
			if (!(nointr & (int)aac_config.irq_mod))

				aac_adapter_notify(dev, AdapNormRespQueue);

		}

	}

	else 

	{

        	printk(KERN_WARNING "aac_fib_adapter_complete: Unknown xferstate detected.\n");

	} else {

		printk(KERN_WARNING "aac_fib_adapter_complete: "

			"Unknown xferstate detected.\n");

		BUG();

	}

	return 0;
@@ -1487,8 +1487,7 @@ int aac_command_thread(void *data) 
	add_wait_queue(&dev->queues->queue[HostNormCmdQueue].cmdready, &wait);

	set_current_state(TASK_INTERRUPTIBLE);

	dprintk ((KERN_INFO "aac_command_thread start\n"));

	while(1) 

	{

	while (1) {

		spin_lock_irqsave(dev->queues->queue[HostNormCmdQueue].lock, flags);

		while(!list_empty(&(dev->queues->queue[HostNormCmdQueue].cmdq))) {

			struct list_head *entry;

drivers/scsi/aacraid/linit.c

+44 −44

File changed.

Contains only whitespace changes.