aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aacraid
diff options
context:
space:
mode:
authorMark Haverkamp <markh@osdl.org>2006-06-08 16:55:57 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-06-19 20:23:54 -0400
commita623e14dafe72329dd1defe36ee2cd4ff4b2e6f1 (patch)
tree68499cbb10448ea645cfab1e82cb7e5969266ee6 /drivers/scsi/aacraid
parent75c3628db75c573870379094a5f90f690ee99b76 (diff)
[SCSI] aacraid: small misc. cleanups
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>
Diffstat (limited to 'drivers/scsi/aacraid')
-rw-r--r--drivers/scsi/aacraid/aacraid.h6
-rw-r--r--drivers/scsi/aacraid/comminit.c2
-rw-r--r--drivers/scsi/aacraid/dpcsup.c4
3 files changed, 4 insertions, 8 deletions
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index e6b41dbbec82..d0eecd4bec83 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -12,7 +12,7 @@
12 12
13#ifndef AAC_DRIVER_BUILD 13#ifndef AAC_DRIVER_BUILD
14# define AAC_DRIVER_BUILD 2409 14# define AAC_DRIVER_BUILD 2409
15# define AAC_DRIVER_BRANCH "-mh1" 15# define AAC_DRIVER_BRANCH "-mh2"
16#endif 16#endif
17#define MAXIMUM_NUM_CONTAINERS 32 17#define MAXIMUM_NUM_CONTAINERS 32
18 18
@@ -822,10 +822,6 @@ struct fib {
822 void *callback_data; 822 void *callback_data;
823 u32 flags; // u32 dmb was ulong 823 u32 flags; // u32 dmb was ulong
824 /* 824 /*
825 * The following is used to put this fib context onto the
826 * Outstanding I/O queue.
827 */
828 /*
829 * And for the internal issue/reply queues (we may be able 825 * And for the internal issue/reply queues (we may be able
830 * to merge these two) 826 * to merge these two)
831 */ 827 */
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 1d43c17642c0..35b0a6ebd3f5 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -103,7 +103,7 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
103 * This assumes the memory is mapped zero->n, which isnt 103 * This assumes the memory is mapped zero->n, which isnt
104 * always true on real computers. It also has some slight problems 104 * always true on real computers. It also has some slight problems
105 * with the GART on x86-64. I've btw never tried DMA from PCI space 105 * with the GART on x86-64. I've btw never tried DMA from PCI space
106 * on this platform but don't be suprised if its problematic. 106 * on this platform but don't be surprised if its problematic.
107 */ 107 */
108#ifndef CONFIG_GART_IOMMU 108#ifndef CONFIG_GART_IOMMU
109 if ((num_physpages << (PAGE_SHIFT - 12)) <= AAC_MAX_HOSTPHYSMEMPAGES) { 109 if ((num_physpages << (PAGE_SHIFT - 12)) <= AAC_MAX_HOSTPHYSMEMPAGES) {
diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c
index bd6a67dd2506..b2a5c7262f36 100644
--- a/drivers/scsi/aacraid/dpcsup.c
+++ b/drivers/scsi/aacraid/dpcsup.c
@@ -85,9 +85,9 @@ unsigned int aac_response_normal(struct aac_queue * q)
85 * continue. The caller has already been notified that 85 * continue. The caller has already been notified that
86 * the fib timed out. 86 * the fib timed out.
87 */ 87 */
88 if (!(fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT)) { 88 if (!(fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT))
89 dev->queues->queue[AdapNormCmdQueue].numpending--; 89 dev->queues->queue[AdapNormCmdQueue].numpending--;
90 } else { 90 else {
91 printk(KERN_WARNING "aacraid: FIB timeout (%x).\n", fib->flags); 91 printk(KERN_WARNING "aacraid: FIB timeout (%x).\n", fib->flags);
92 printk(KERN_DEBUG"aacraid: hwfib=%p fib index=%i fib=%p\n",hwfib, hwfib->header.SenderData,fib); 92 printk(KERN_DEBUG"aacraid: hwfib=%p fib index=%i fib=%p\n",hwfib, hwfib->header.SenderData,fib);
93 continue; 93 continue;