From: Guo-Fu Tseng Date: Thu, 4 Dec 2008 05:20:04 +0000 (-0800) Subject: jme: Remove 64 and 40 bit dma_mask X-Git-Tag: v2.6.29-rc1~581^2~324 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e4e6c38cab208b369bfc8e9a57186581bf0b9987;p=linux-2.6-omap-h63xx.git jme: Remove 64 and 40 bit dma_mask Although the hardware supports the 64bit DMA address in design, but later found that it actually not working. This patch reduced the rang to 32bit. Found-by: "Ethan" Signed-off-by: "Guo-Fu Tseng" Acked-by: Jeff Garzik Signed-off-by: David S. Miller --- diff --git a/drivers/net/jme.c b/drivers/net/jme.c index e10d9f38662..15035cb1738 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c @@ -2591,14 +2591,6 @@ static const struct ethtool_ops jme_ethtool_ops = { static int jme_pci_dma64(struct pci_dev *pdev) { - if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) - if (!pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK)) - return 1; - - if (!pci_set_dma_mask(pdev, DMA_40BIT_MASK)) - if (!pci_set_consistent_dma_mask(pdev, DMA_40BIT_MASK)) - return 1; - if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) if (!pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) return 0;