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

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

[PATCH] drivers/net/wireless/ipw2100: Use the DMA_32BIT_MASK constant 

Use the DMA_32BIT_MASK constant from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask() instead of custom macros.

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>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
parent 070d0165

drivers/net/wireless/ipw2100.c

+2 −5
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ that only one external action is invoked at a time. 
#include <linux/netdevice.h>

#include <linux/ethtool.h>

#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include <linux/proc_fs.h>

#include <linux/skbuff.h>

#include <asm/uaccess.h>
@@ -6423,10 +6424,6 @@ static struct net_device *ipw2100_alloc_device( 
	return dev;

}







#define PCI_DMA_32BIT   0x00000000ffffffffULL



static int ipw2100_pci_init_one(struct pci_dev *pci_dev,

				const struct pci_device_id *ent)

{
@@ -6480,7 +6477,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev, 
	pci_set_master(pci_dev);

	pci_set_drvdata(pci_dev, priv);



	err = pci_set_dma_mask(pci_dev, PCI_DMA_32BIT);

	err = pci_set_dma_mask(pci_dev, DMA_32BIT_MASK);

	if (err) {

		printk(KERN_WARNING DRV_NAME

		       "Error calling pci_set_dma_mask.\n");