Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e7f0bd8 authored by Domen Puncer's avatar Domen Puncer Committed by Jeff Garzik
Browse files

drivers/net/: 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()

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: default avatarTobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: default avatarDomen Puncer <domen@coderock.org>
parent 5ccabb9b

drivers/net/acenic.c

+3 −2
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
#include <linux/errno.h>

#include <linux/ioport.h>

#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include <linux/kernel.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>
@@ -1167,9 +1168,9 @@ static int __devinit ace_init(struct net_device *dev) 
	/*

	 * Configure DMA attributes.

	 */

	if (!pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) {

	if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {

		ap->pci_using_dac = 1;

	} else if (!pci_set_dma_mask(pdev, 0xffffffffULL)) {

	} else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {

		ap->pci_using_dac = 0;

	} else {

		ecode = -ENODEV;

drivers/net/e100.c

+2 −1
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ 
#include <linux/delay.h>

#include <linux/init.h>

#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>

#include <linux/mii.h>
@@ -2286,7 +2287,7 @@ static int __devinit e100_probe(struct pci_dev *pdev, 
		goto err_out_disable_pdev;

	}



	if((err = pci_set_dma_mask(pdev, 0xFFFFFFFFULL))) {

	if((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) {

		DPRINTK(PROBE, ERR, "No usable DMA configuration, aborting.\n");

		goto err_out_free_res;

	}

drivers/net/hp100.c

+2 −1
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ 
#include <linux/interrupt.h>

#include <linux/eisa.h>

#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include <linux/spinlock.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>
@@ -557,7 +558,7 @@ static int __devinit hp100_probe1(struct net_device *dev, int ioaddr, 
			 * Also, we can have EISA Busmaster cards (not tested),

			 * so beware !!! - Jean II */

			if((bus == HP100_BUS_PCI) &&

			   (pci_set_dma_mask(pci_dev, 0xffffffff))) {

			   (pci_set_dma_mask(pci_dev, DMA_32BIT_MASK))) {

				/* Gracefully fallback to shared memory */

				goto busmasterfail;

			}

drivers/net/ns83820.c

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 
#include <linux/moduleparam.h>

#include <linux/types.h>

#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>

#include <linux/delay.h>

drivers/net/s2io.c

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

#include <linux/ioport.h>

#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include <linux/kernel.h>

#include <linux/netdevice.h>

#include <linux/etherdevice.h>
@@ -4593,19 +4594,19 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) 
		return ret;

	}



	if (!pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) {

	if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {

		DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 64bit DMA\n");

		dma_flag = TRUE;



		if (pci_set_consistent_dma_mask

		    (pdev, 0xffffffffffffffffULL)) {

		    (pdev, DMA_64BIT_MASK)) {

			DBG_PRINT(ERR_DBG,

				  "Unable to obtain 64bit DMA for \

					consistent allocations\n");

			pci_disable_device(pdev);

			return -ENOMEM;

		}

	} else if (!pci_set_dma_mask(pdev, 0xffffffffUL)) {

	} else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {

		DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 32bit DMA\n");

	} else {

		pci_disable_device(pdev);