From: Kev Jackson <foamdino@xxxxxxxxx>
-Remove TW_DMA_MASK and use DMA_32BIT_MASK as listed in kernel janitors TODO list
Signed-off-by: Kev Jackson <foamdino@xxxxxxxxx>
---
drivers/scsi/3w-xxxx.c | 2 +-
drivers/scsi/3w-xxxx.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
-patch applies fine on current kernel tree & new kernel compiles
-previously submitted to kernel-janitors@xxxxxxxxxxxxxx
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 656bdb1..15ca2a0 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -2338,7 +2338,7 @@ static int __devinit tw_probe(struct pci_dev *pdev, const struct pci_device_id *
pci_set_master(pdev);
- retval = pci_set_dma_mask(pdev, TW_DMA_MASK);
+ retval = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (retval) {
printk(KERN_WARNING "3w-xxxx: Failed to set dma mask.");
goto out_disable_device;
diff --git a/drivers/scsi/3w-xxxx.h b/drivers/scsi/3w-xxxx.h
index 0742e68..4efd6c2 100644
--- a/drivers/scsi/3w-xxxx.h
+++ b/drivers/scsi/3w-xxxx.h
@@ -234,7 +234,6 @@ static unsigned char tw_sense_table[][4] =
#define TW_IOCTL_TIMEOUT 25 /* 25 seconds */
#define TW_IOCTL_CHRDEV_TIMEOUT 60 /* 60 seconds */
#define TW_IOCTL_CHRDEV_FREE -1
-#define TW_DMA_MASK DMA_32BIT_MASK
#define TW_MAX_CDB_LEN 16
/* Bitmask macros to eliminate bitfields */
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
