From: Tobias Klauser <tklauser@nuerscht.ch>
To: kernel-janitors@lists.osdl.org
Cc: andrew.vasquez@qlogic.com, linux-scsi@vger.kernel.org
Subject: [UPDATE PATCH 17/19] drivers/scsi/qla1280: Use the DMA_32BIT_MASK constant
Date: Sun, 20 Mar 2005 14:20:49 +0100 [thread overview]
Message-ID: <20050320132049.GQ3491@localhost.localdomain> (raw)
In-Reply-To: <20050220171200.GR14375@helium.tklauser.home>
The previous patch did not compile cleanly on all architectures so
here's a fixed one.
Use the DMA_32BIT_MASK constant from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask()
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>
--- linux-2.6.11.orig/drivers/scsi/qla1280.c 2005-03-02 12:50:38.000000000 +0100
+++ linux-2.6.11/drivers/scsi/qla1280.c 2005-03-20 13:27:54.000000000 +0100
@@ -345,6 +345,7 @@
#include <linux/pci_ids.h>
#include <linux/interrupt.h>
#include <linux/init.h>
+#include <linux/dma-mapping.h>
#include <asm/io.h>
#include <asm/irq.h>
@@ -4741,7 +4742,7 @@ qla1280_probe_one(struct pci_dev *pdev,
#ifdef QLA_64BIT_PTR
if (pci_set_dma_mask(ha->pdev, (dma_addr_t) ~ 0ULL)) {
- if (pci_set_dma_mask(ha->pdev, 0xffffffff)) {
+ if (pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK)) {
printk(KERN_WARNING "scsi(%li): Unable to set a "
" suitable DMA mask - aboring\n", ha->host_no);
error = -ENODEV;
@@ -4751,7 +4752,7 @@ qla1280_probe_one(struct pci_dev *pdev,
dprintk(2, "scsi(%li): 64 Bit PCI Addressing Enabled\n",
ha->host_no);
#else
- if (pci_set_dma_mask(ha->pdev, 0xffffffff)) {
+ if (pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK)) {
printk(KERN_WARNING "scsi(%li): Unable to set a "
" suitable DMA mask - aboring\n", ha->host_no);
error = -ENODEV;
prev parent reply other threads:[~2005-03-20 13:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-02-20 17:12 [PATCH 17/19] drivers/scsi/qla1280: Use the DMA_{64,32}BIT_MASK constants Tobias Klauser
2005-03-20 13:20 ` Tobias Klauser [this message]
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=20050320132049.GQ3491@localhost.localdomain \
--to=tklauser@nuerscht.ch \
--cc=andrew.vasquez@qlogic.com \
--cc=kernel-janitors@lists.osdl.org \
--cc=linux-scsi@vger.kernel.org \
/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