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 03/14] alpha: use include/linux/pci-dma.h
    Date
    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Cc: Richard Henderson <rth@twiddle.net>
    Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
    Cc: Matt Turner <mattst88@gmail.com>
    ---
    arch/alpha/Kconfig | 3 +++
    arch/alpha/include/asm/pci.h | 14 +-------------
    2 files changed, 4 insertions(+), 13 deletions(-)

    diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
    index bd7261e..759f49d 100644
    --- a/arch/alpha/Kconfig
    +++ b/arch/alpha/Kconfig
    @@ -58,6 +58,9 @@ config ZONE_DMA
    bool
    default y

    +config NEED_DMA_MAP_STATE
    + def_bool y
    +
    config GENERIC_ISA_DMA
    bool
    default y
    diff --git a/arch/alpha/include/asm/pci.h b/arch/alpha/include/asm/pci.h
    index dd8dcab..4765946 100644
    --- a/arch/alpha/include/asm/pci.h
    +++ b/arch/alpha/include/asm/pci.h
    @@ -119,19 +119,7 @@ pci_dma_mapping_error(struct pci_dev *pdev, dma_addr_t dma_addr)
    extern void pci_unmap_single(struct pci_dev *, dma_addr_t, size_t, int);
    extern void pci_unmap_page(struct pci_dev *, dma_addr_t, size_t, int);

    -/* 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))
    +#include <linux/pci-dma.h>

    /* Map a set of buffers described by scatterlist in streaming mode for
    PCI DMA. This is the scatter-gather version of the above
    --
    1.5.6.5


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