evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SCSI] aacraid: small misc. cleanups

Browse source 
Received from Mark Salyzyn

Spelling correction, orphaned comment removal & update branch name.

Signed-off-by: Mark Haverkamp <markh@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Mark Haverkamp 2006-06-08 13:55:57 -07:00 • committed by James Bottomley
parent 75c3628db7
commit a623e14daf
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/scsi/aacraid/aacraid.h
View file

@ -12,7 +12,7 @@
#ifndef AAC_DRIVER_BUILD #ifndef AAC_DRIVER_BUILD
# define AAC_DRIVER_BUILD 2409 # define AAC_DRIVER_BUILD 2409
# define AAC_DRIVER_BRANCH "-mh1" # define AAC_DRIVER_BRANCH "-mh2"
#endif #endif
#define MAXIMUM_NUM_CONTAINERS 32 #define MAXIMUM_NUM_CONTAINERS 32
@ -821,10 +821,6 @@ struct fib {
fib_callback callback; fib_callback callback;
void *callback_data; void *callback_data;
u32 flags; // u32 dmb was ulong u32 flags; // u32 dmb was ulong
/*
* The following is used to put this fib context onto the
* Outstanding I/O queue.
*/
/* /*
* And for the internal issue/reply queues (we may be able * And for the internal issue/reply queues (we may be able
* to merge these two) * to merge these two)

2
drivers/scsi/aacraid/comminit.c
View file

@ -103,7 +103,7 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
* This assumes the memory is mapped zero->n, which isnt * This assumes the memory is mapped zero->n, which isnt
* always true on real computers. It also has some slight problems * always true on real computers. It also has some slight problems
* with the GART on x86-64. I've btw never tried DMA from PCI space * with the GART on x86-64. I've btw never tried DMA from PCI space
* on this platform but don't be suprised if its problematic. * on this platform but don't be surprised if its problematic.
*/ */
#ifndef CONFIG_GART_IOMMU #ifndef CONFIG_GART_IOMMU
if ((num_physpages << (PAGE_SHIFT - 12)) <= AAC_MAX_HOSTPHYSMEMPAGES) { if ((num_physpages << (PAGE_SHIFT - 12)) <= AAC_MAX_HOSTPHYSMEMPAGES) {

4
drivers/scsi/aacraid/dpcsup.c
View file

@ -85,9 +85,9 @@ unsigned int aac_response_normal(struct aac_queue * q)
* continue. The caller has already been notified that * continue. The caller has already been notified that
* the fib timed out. * the fib timed out.
*/ */
if (!(fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT)) { if (!(fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT))
dev->queues->queue[AdapNormCmdQueue].numpending--; dev->queues->queue[AdapNormCmdQueue].numpending--;
} else { else {
printk(KERN_WARNING "aacraid: FIB timeout (%x).\n", fib->flags); printk(KERN_WARNING "aacraid: FIB timeout (%x).\n", fib->flags);
printk(KERN_DEBUG"aacraid: hwfib=%p fib index=%i fib=%p\n",hwfib, hwfib->header.SenderData,fib); printk(KERN_DEBUG"aacraid: hwfib=%p fib index=%i fib=%p\n",hwfib, hwfib->header.SenderData,fib);
continue; continue;