From: domen@coderock.org
To: axboe@suse.de
Cc: linux-kernel@vger.kernel.org,
Tobias Klauser <tklauser@nuerscht.ch>,
domen@coderock.org
Subject: [patch 12/12] block/cpqarray: Use the DMA_32BIT_MASK constant
Date: Mon, 20 Jun 2005 23:51:42 +0200 [thread overview]
Message-ID: <20050620215140.909269000@nd47.coderock.org> (raw)
[-- Attachment #1: dma_mask-drivers_block_cpqarray.patch --]
[-- Type: text/plain, Size: 1421 bytes --]
From: Tobias Klauser <tklauser@nuerscht.ch>
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>
---
cpqarray.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
Index: quilt/drivers/block/cpqarray.c
===================================================================
--- quilt.orig/drivers/block/cpqarray.c
+++ quilt/drivers/block/cpqarray.c
@@ -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;
--
reply other threads:[~2005-06-21 6:11 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050620215140.909269000@nd47.coderock.org \
--to=domen@coderock.org \
--cc=axboe@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=tklauser@nuerscht.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox