Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753489Ab0BNXe4 (ORCPT ); Sun, 14 Feb 2010 18:34:56 -0500 Received: from gate.crashing.org ([63.228.1.57]:34411 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752882Ab0BNXez (ORCPT ); Sun, 14 Feb 2010 18:34:55 -0500 Subject: Re: [PATCH -mm 3/7] pci: convert pci_set_dma_mask to call dma_set_mask From: Benjamin Herrenschmidt To: FUJITA Tomonori Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, James Bottomley , "David S. Miller" , Jesse Barnes , Russell King In-Reply-To: <1265967212-9126-4-git-send-email-fujita.tomonori@lab.ntt.co.jp> References: <1265967212-9126-1-git-send-email-fujita.tomonori@lab.ntt.co.jp> <1265967212-9126-4-git-send-email-fujita.tomonori@lab.ntt.co.jp> Content-Type: text/plain; charset="UTF-8" Date: Mon, 15 Feb 2010 10:33:41 +1100 Message-ID: <1266190421.16346.71.camel@pasglop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1648 Lines: 52 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 > Cc: James Bottomley > Cc: David S. Miller > Cc: Jesse Barnes Acked-by: Benjamin Herrenschmidt > Cc: Russell King > --- > 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/