public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
From: Tobias Klauser <tklauser@nuerscht.ch>
To: kernel-janitors@lists.osdl.org
Cc: linux-scsi@vger.kernel.org
Subject: [UPDATE PATCH 09/19] drivers/scsi/dpt_i2o: Use the DMA_{64, 32}BIT_MASK constants
Date: Sun, 20 Mar 2005 13:47:11 +0100	[thread overview]
Message-ID: <20050320124711.GI3491@localhost.localdomain> (raw)
In-Reply-To: <20050220170414.GJ14375@helium.tklauser.home>

The previous patch did not compile cleanly on all architectures so
here's a fixed one.

Use the DMA_{64,32}BIT_MASK constants 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/dpt_i2o.c	2005-03-02 12:50:38.000000000 +0100
+++ linux-2.6.11/drivers/scsi/dpt_i2o.c	2005-03-20 13:27:54.000000000 +0100
@@ -62,6 +62,7 @@ MODULE_DESCRIPTION("Adaptec I2O RAID Dri
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/ioport.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/processor.h>	/* for boot_cpu_data */
 #include <asm/pgtable.h>
@@ -881,8 +882,8 @@ static int adpt_install_hba(struct scsi_
 		return -EINVAL;
 	}
 	pci_set_master(pDev);
-	if (pci_set_dma_mask(pDev, 0xffffffffffffffffULL) &&
-	    pci_set_dma_mask(pDev, 0xffffffffULL))
+	if (pci_set_dma_mask(pDev, DMA_64BIT_MASK) &&
+	    pci_set_dma_mask(pDev, DMA_32BIT_MASK))
 		return -EINVAL;
 
 	base_addr0_phys = pci_resource_start(pDev,0);

      reply	other threads:[~2005-03-20 12:47 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-02-20 17:04 [PATCH 09/19] drivers/scsi/dpt_i2o: Use the DMA_{64,32}BIT_MASK constants Tobias Klauser
2005-03-20 12:47 ` 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=20050320124711.GI3491@localhost.localdomain \
    --to=tklauser@nuerscht.ch \
    --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