2010-07-12 06:37:35

by FUJITA Tomonori

Subject: [PATCH] microblaze: remove unused HAVE_ARCH_PCI_SET_DMA_MASK

HAVE_ARCH_PCI_SET_DMA_MASK was removed in 2.6.36 (no architecture has
the own implementation of pci_set_dma_mask).

Signed-off-by: FUJITA Tomonori <[email protected]>
---
arch/microblaze/include/asm/dma-mapping.h | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/arch/microblaze/include/asm/dma-mapping.h b/arch/microblaze/include/asm/dma-mapping.h
index 18b3731..5073895 100644
--- a/arch/microblaze/include/asm/dma-mapping.h
+++ b/arch/microblaze/include/asm/dma-mapping.h
@@ -79,12 +79,6 @@ static inline int dma_supported(struct device *dev, u64 mask)
return ops->dma_supported(dev, mask);
}

-#ifdef CONFIG_PCI
-/* We have our own implementation of pci_set_dma_mask() */
-#define HAVE_ARCH_PCI_SET_DMA_MASK
-
-#endif
-
static inline int dma_set_mask(struct device *dev, u64 dma_mask)
{
struct dma_map_ops *ops = get_dma_ops(dev);
--
1.6.5

2010-07-12 06:39:34

by FUJITA Tomonori

Subject: Re: [PATCH] microblaze: remove unused HAVE_ARCH_PCI_SET_DMA_MASK

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

> HAVE_ARCH_PCI_SET_DMA_MASK was removed in 2.6.36 (no architecture has

Oops, HAVE_ARCH_PCI_SET_DMA_MASK was removed in 2.6.34.

2010-07-12 13:18:51

by Michal Simek

Subject: Re: [PATCH] microblaze: remove unused HAVE_ARCH_PCI_SET_DMA_MASK

FUJITA Tomonori wrote:
> HAVE_ARCH_PCI_SET_DMA_MASK was removed in 2.6.36 (no architecture has
> the own implementation of pci_set_dma_mask).

Added to next branch. I also fixed that kernel version.

Thanks,
Michal

>
> Signed-off-by: FUJITA Tomonori <[email protected]>
> ---
> arch/microblaze/include/asm/dma-mapping.h | 6 ------
> 1 files changed, 0 insertions(+), 6 deletions(-)
>
> diff --git a/arch/microblaze/include/asm/dma-mapping.h b/arch/microblaze/include/asm/dma-mapping.h
> index 18b3731..5073895 100644
> --- a/arch/microblaze/include/asm/dma-mapping.h
> +++ b/arch/microblaze/include/asm/dma-mapping.h
> @@ -79,12 +79,6 @@ static inline int dma_supported(struct device *dev, u64 mask)
> return ops->dma_supported(dev, mask);
> }
>
> -#ifdef CONFIG_PCI
> -/* We have our own implementation of pci_set_dma_mask() */
> -#define HAVE_ARCH_PCI_SET_DMA_MASK
> -
> -#endif
> -
> static inline int dma_set_mask(struct device *dev, u64 dma_mask)
> {
> struct dma_map_ops *ops = get_dma_ops(dev);


--
Michal Simek, Ing. (M.Eng)
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/
Microblaze U-BOOT custodian