lkml.org 
[lkml]   [2008]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/20] x86: move dma_sync_sg_for_cpu to common header
    Date
    i386 gets an empty function

    Signed-off-by: Glauber Costa <gcosta@redhat.com>
    ---
    arch/x86/kernel/pci-base_32.c | 1 +
    include/asm-x86/dma-mapping.h | 9 +++++++++
    include/asm-x86/dma-mapping_32.h | 6 ------
    include/asm-x86/dma-mapping_64.h | 11 -----------
    4 files changed, 10 insertions(+), 17 deletions(-)

    diff --git a/arch/x86/kernel/pci-base_32.c b/arch/x86/kernel/pci-base_32.c
    index 4512c30..d876600 100644
    --- a/arch/x86/kernel/pci-base_32.c
    +++ b/arch/x86/kernel/pci-base_32.c
    @@ -39,6 +39,7 @@ static const struct dma_mapping_ops pci32_dma_ops = {
    .sync_single_for_device = NULL,
    .sync_single_range_for_cpu = NULL,
    .sync_single_range_for_device = NULL,
    + .sync_sg_for_cpu = NULL,
    };

    const struct dma_mapping_ops *dma_ops = &pci32_dma_ops;
    diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h
    index 260538b..1a301d7 100644
    --- a/include/asm-x86/dma-mapping.h
    +++ b/include/asm-x86/dma-mapping.h
    @@ -139,4 +139,13 @@ dma_sync_single_range_for_device(struct device *hwdev, dma_addr_t dma_handle,
    flush_write_buffers();
    }

    +static inline void
    +dma_sync_sg_for_cpu(struct device *hwdev, struct scatterlist *sg,
    + int nelems, int direction)
    +{
    + BUG_ON(!valid_dma_direction(direction));
    + if (dma_ops->sync_sg_for_cpu)
    + dma_ops->sync_sg_for_cpu(hwdev, sg, nelems, direction);
    + flush_write_buffers();
    +}
    #endif
    diff --git a/include/asm-x86/dma-mapping_32.h b/include/asm-x86/dma-mapping_32.h
    index 60d5371..e7c82e3 100644
    --- a/include/asm-x86/dma-mapping_32.h
    +++ b/include/asm-x86/dma-mapping_32.h
    @@ -33,12 +33,6 @@ dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
    }

    static inline void
    -dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
    - enum dma_data_direction direction)
    -{
    -}
    -
    -static inline void
    dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,
    enum dma_data_direction direction)
    {
    diff --git a/include/asm-x86/dma-mapping_64.h b/include/asm-x86/dma-mapping_64.h
    index dfa66cc..804b154 100644
    --- a/include/asm-x86/dma-mapping_64.h
    +++ b/include/asm-x86/dma-mapping_64.h
    @@ -27,17 +27,6 @@ extern void dma_free_coherent(struct device *dev, size_t size, void *vaddr,
    dma_map_single((dev), page_address(page)+(offset), (size), (dir))

    #define dma_unmap_page dma_unmap_single
    -
    -static inline void
    -dma_sync_sg_for_cpu(struct device *hwdev, struct scatterlist *sg,
    - int nelems, int direction)
    -{
    - BUG_ON(!valid_dma_direction(direction));
    - if (dma_ops->sync_sg_for_cpu)
    - dma_ops->sync_sg_for_cpu(hwdev, sg, nelems, direction);
    - flush_write_buffers();
    -}
    -
    static inline void
    dma_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg,
    int nelems, int direction)
    --
    1.5.0.6


    \
     
     \ /
      Last update: 2008-03-25 22:43    [W:0.026 / U:0.400 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site