lkml.org 
[lkml]   [2005]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[patch 1/1] block/cpqarray: Use the DMA_32BIT_MASK constant
From
Date


Use the DMA_32BIT_MASK constant from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask() instead of custom
macros.
This patch includes dma-mapping.h explicitly because it caused errors
on some architectures otherwise.
See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Domen Puncer <domen@coderock.org>
---


kj-domen/drivers/block/cpqarray.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)

diff -puN drivers/block/cpqarray.c~dma_mask-drivers_block_cpqarray drivers/block/cpqarray.c
--- kj/drivers/block/cpqarray.c~dma_mask-drivers_block_cpqarray 2005-04-05 12:57:44.000000000 +0200
+++ kj-domen/drivers/block/cpqarray.c 2005-04-05 12:57:44.000000000 +0200
@@ -39,6 +39,7 @@
#include <linux/spinlock.h>
#include <linux/blkdev.h>
#include <linux/genhd.h>
+#include <linux/dma-mapping.h>
#include <asm/uaccess.h>
#include <asm/io.h>

@@ -65,8 +66,6 @@ MODULE_LICENSE("GPL");
#define MAX_CTLR 8
#define CTLR_SHIFT 8

-#define CPQARRAY_DMA_MASK 0xFFFFFFFF /* 32 bit DMA */
-
static int nr_ctlr;
static ctlr_info_t *hba[MAX_CTLR];

@@ -626,7 +625,7 @@ static int cpqarray_pci_init(ctlr_info_t
for(i=0; i<6; i++)
addr[i] = pci_resource_start(pdev, i);

- if (pci_set_dma_mask(pdev, CPQARRAY_DMA_MASK) != 0)
+ if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) != 0)
{
printk(KERN_ERR "cpqarray: Unable to set DMA mask\n");
return -1;
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-04-08 10:45    [W:0.055 / U:0.044 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site