lkml.org 
[lkml]   [2010]   [Feb]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 -mm 07/14] mips: use include/linux/pci-dma.h
    Date
    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Cc: Ralf Baechle <ralf@linux-mips.org>
    ---
    arch/mips/Kconfig | 4 ++--
    arch/mips/include/asm/pci.h | 22 +---------------------
    2 files changed, 3 insertions(+), 23 deletions(-)

    diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
    index 591ca0c..29e8692 100644
    --- a/arch/mips/Kconfig
    +++ b/arch/mips/Kconfig
    @@ -812,9 +812,9 @@ config DMA_COHERENT

    config DMA_NONCOHERENT
    bool
    - select DMA_NEED_PCI_MAP_STATE
    + select NEED_DMA_MAP_STATE

    -config DMA_NEED_PCI_MAP_STATE
    +config NEED_DMA_MAP_STATE
    bool

    config SYS_HAS_EARLY_PRINTK
    diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h
    index 5ebf825..9b196f8 100644
    --- a/arch/mips/include/asm/pci.h
    +++ b/arch/mips/include/asm/pci.h
    @@ -102,27 +102,7 @@ struct pci_dev;
    */
    extern unsigned int PCI_DMA_BUS_IS_PHYS;

    -#ifdef CONFIG_DMA_NEED_PCI_MAP_STATE
    -
    -/* pci_unmap_{single,page} is not a nop, thus... */
    -#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) dma_addr_t ADDR_NAME;
    -#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) __u32 LEN_NAME;
    -#define pci_unmap_addr(PTR, ADDR_NAME) ((PTR)->ADDR_NAME)
    -#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) (((PTR)->ADDR_NAME) = (VAL))
    -#define pci_unmap_len(PTR, LEN_NAME) ((PTR)->LEN_NAME)
    -#define pci_unmap_len_set(PTR, LEN_NAME, VAL) (((PTR)->LEN_NAME) = (VAL))
    -
    -#else /* CONFIG_DMA_NEED_PCI_MAP_STATE */
    -
    -/* pci_unmap_{page,single} is a nop so... */
    -#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)
    -#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)
    -#define pci_unmap_addr(PTR, ADDR_NAME) (0)
    -#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0)
    -#define pci_unmap_len(PTR, LEN_NAME) (0)
    -#define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0)
    -
    -#endif /* CONFIG_DMA_NEED_PCI_MAP_STATE */
    +#include <linux/pci-dma.h>

    #ifdef CONFIG_PCI
    static inline void pci_dma_burst_advice(struct pci_dev *pdev,
    --
    1.5.6.5


    \
     
     \ /
      Last update: 2010-02-10 02:43    [W:0.022 / U:1.012 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site