Commit a3948663 authored by Tobias Klauser's avatar Tobias Klauser Committed by Jeff Garzik
Browse files

[PATCH] drivers/block/sx8.c: Use the DMA_{64, 32}BIT_MASK constants 

Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask()
These patches include 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: default avatarTobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: default avatarDomen Puncer <domen@coderock.org>
parent 020f46a3

drivers/block/sx8.c

+4 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/delay.h>

#include <linux/time.h>

#include <linux/hdreg.h>

#include <linux/dma-mapping.h>

#include <asm/io.h>

#include <asm/semaphore.h>

#include <asm/uaccess.h>
@@ -1582,9 +1583,9 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_out;



#if IF_64BIT_DMA_IS_POSSIBLE /* grrrr... */

	rc = pci_set_dma_mask(pdev, 0xffffffffffffffffULL);

	rc = pci_set_dma_mask(pdev, DMA_64BIT_MASK);

	if (!rc) {

		rc = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL);

		rc = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);

		if (rc) {

			printk(KERN_ERR DRV_NAME "(%s): consistent DMA mask failure\n",

				pci_name(pdev));
@@ -1593,7 +1594,7 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
		pci_dac = 1;

	} else {

#endif

		rc = pci_set_dma_mask(pdev, 0xffffffffULL);

		rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);

		if (rc) {

			printk(KERN_ERR DRV_NAME "(%s): DMA mask failure\n",

				pci_name(pdev));

CRA Git | Maintained and supported by SUSTech CRA and CCSE