提交 a623e14d 编写于 作者: M Mark Haverkamp 提交者: James Bottomley

[SCSI] aacraid: small misc. cleanups

Received from Mark Salyzyn

Spelling correction, orphaned comment removal & update branch name.
Signed-off-by: NMark Haverkamp <markh@osdl.org>
Signed-off-by: NJames Bottomley <James.Bottomley@SteelEye.com>
上级 75c3628d
...@@ -12,7 +12,7 @@ ...@@ -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 { ...@@ -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)
......
...@@ -103,7 +103,7 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co ...@@ -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) {
......
...@@ -85,9 +85,9 @@ unsigned int aac_response_normal(struct aac_queue * q) ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册