2010-07-12 06:59:15

by FUJITA Tomonori

Subject: [PATCH] pci: remove unused HAVE_ARCH_PCI_SET_DMA_MAX_SEGMENT_{SIZE|BOUNDARY}

In 2.6.34, we transformed the PCI DMA API into the generic device
mode. The PCI DMA API is just the wrapper of the DMA API.

So we don't need HAVE_ARCH_PCI_SET_DMA_MAX_SEGMENT_SIZE or
HAVE_ARCH_PCI_SET_DMA_SEGMENT_BOUNDARY (which enable architectures to
have the own implementations). Both haven't been used anyway.

Signed-off-by: FUJITA Tomonori <[email protected]>
---
drivers/pci/pci.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 130ed1d..7fa3cbd 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2312,21 +2312,17 @@ void pci_msi_off(struct pci_dev *dev)
}
EXPORT_SYMBOL_GPL(pci_msi_off);

-#ifndef HAVE_ARCH_PCI_SET_DMA_MAX_SEGMENT_SIZE
int pci_set_dma_max_seg_size(struct pci_dev *dev, unsigned int size)
{
return dma_set_max_seg_size(&dev->dev, size);
}
EXPORT_SYMBOL(pci_set_dma_max_seg_size);
-#endif

-#ifndef HAVE_ARCH_PCI_SET_DMA_SEGMENT_BOUNDARY
int pci_set_dma_seg_boundary(struct pci_dev *dev, unsigned long mask)
{
return dma_set_seg_boundary(&dev->dev, mask);
}
EXPORT_SYMBOL(pci_set_dma_seg_boundary);
-#endif

static int pcie_flr(struct pci_dev *dev, int probe)
{
--
1.6.5

2010-07-16 19:09:56

by Jesse Barnes

Subject: Re: [PATCH] pci: remove unused HAVE_ARCH_PCI_SET_DMA_MAX_SEGMENT_{SIZE|BOUNDARY}

On Mon, 12 Jul 2010 15:59:11 +0900
FUJITA Tomonori <[email protected]> wrote:

> In 2.6.34, we transformed the PCI DMA API into the generic device
> mode. The PCI DMA API is just the wrapper of the DMA API.
>
> So we don't need HAVE_ARCH_PCI_SET_DMA_MAX_SEGMENT_SIZE or
> HAVE_ARCH_PCI_SET_DMA_SEGMENT_BOUNDARY (which enable architectures to
> have the own implementations). Both haven't been used anyway.
>
> Signed-off-by: FUJITA Tomonori <[email protected]>
> ---
> drivers/pci/pci.c | 4 ----

Applied to my linux-next branch, thanks.

--
Jesse Barnes, Intel Open Source Technology Center