[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1266190421.16346.71.camel@pasglop>
Date: Mon, 15 Feb 2010 10:33:41 +1100
From: Benjamin Herrenschmidt <benh@...nel.crashing.org>
To: FUJITA Tomonori <fujita.tomonori@....ntt.co.jp>
Cc: linux-kernel@...r.kernel.org, akpm@...ux-foundation.org,
James Bottomley <James.Bottomley@...e.de>,
"David S. Miller" <davem@...emloft.net>,
Jesse Barnes <jbarnes@...tuousgeek.org>,
Russell King <linux@....linux.org.uk>
Subject: Re: [PATCH -mm 3/7] pci: convert pci_set_dma_mask to call
dma_set_mask
On Fri, 2010-02-12 at 18:33 +0900, FUJITA Tomonori wrote:
> This changes pci_set_dma_mask to call the generic DMA API,
> dma_set_mask.
>
> pci_set_dma_mask (in drivers/pci/pci.c) does the same things that
> dma_set_mask does on all the architectures that use pci_set_dma_mask;
> calls dma_supprted and sets dev->dma_mask. So we safely change
> pci_set_dma_mask to simply call dma_set_mask.
>
> Signed-off-by: FUJITA Tomonori <fujita.tomonori@....ntt.co.jp>
> Cc: James Bottomley <James.Bottomley@...e.de>
> Cc: David S. Miller <davem@...emloft.net>
> Cc: Jesse Barnes <jbarnes@...tuousgeek.org>
Acked-by: Benjamin Herrenschmidt <benh@...nel.crashing.org>
> Cc: Russell King <linux@....linux.org.uk>
> ---
> drivers/pci/pci.c | 10 ++++------
> 1 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
> index 315fea4..5c881e9 100644
> --- a/drivers/pci/pci.c
> +++ b/drivers/pci/pci.c
> @@ -2121,15 +2121,13 @@ void pci_msi_off(struct pci_dev *dev)
> int
> pci_set_dma_mask(struct pci_dev *dev, u64 mask)
> {
> - if (!pci_dma_supported(dev, mask))
> - return -EIO;
> -
> - dev->dma_mask = mask;
> + int ret = dma_set_mask(&dev->dev, mask);
> + if (ret)
> + return ret;
> dev_dbg(&dev->dev, "using %dbit DMA mask\n", fls64(mask));
> -
> return 0;
> }
> -
> +
> int
> pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
> {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists