lkml.org 
[lkml]   [2009]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/3] dma-mapping:remove CONFIG_HAVE_DMA_ATTRS
    Date
    From: Ming Lei <tom.leiming@gmail.com>


    Signed-off-by: Ming Lei <tom.leiming@gmail.com>
    ---
    include/linux/dma-attrs.h | 10 ----------
    include/linux/dma-mapping.h | 17 -----------------
    2 files changed, 0 insertions(+), 27 deletions(-)

    diff --git a/include/linux/dma-attrs.h b/include/linux/dma-attrs.h
    index 71ad34e..fce45cd 100644
    --- a/include/linux/dma-attrs.h
    +++ b/include/linux/dma-attrs.h
    @@ -36,7 +36,6 @@ static inline void init_dma_attrs(struct dma_attrs *attrs)
    bitmap_zero(attrs->flags, __DMA_ATTRS_LONGS);
    }

    -#ifdef CONFIG_HAVE_DMA_ATTRS
    /**
    * dma_set_attr - set a specific attribute
    * @attr: attribute to set
    @@ -62,14 +61,5 @@ static inline int dma_get_attr(enum dma_attr attr, struct dma_attrs *attrs)
    BUG_ON(attr >= DMA_ATTR_MAX);
    return test_bit(attr, attrs->flags);
    }
    -#else /* !CONFIG_HAVE_DMA_ATTRS */
    -static inline void dma_set_attr(enum dma_attr attr, struct dma_attrs *attrs)
    -{
    -}

    -static inline int dma_get_attr(enum dma_attr attr, struct dma_attrs *attrs)
    -{
    - return 0;
    -}
    -#endif /* CONFIG_HAVE_DMA_ATTRS */
    #endif /* _DMA_ATTR_H */
    diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
    index 07dfd46..b83acee 100644
    --- a/include/linux/dma-mapping.h
    +++ b/include/linux/dma-mapping.h
    @@ -219,21 +219,4 @@ static inline void dmam_release_declared_memory(struct device *dev)
    }
    #endif /* ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY */

    -#ifndef CONFIG_HAVE_DMA_ATTRS
    -struct dma_attrs;
    -
    -#define dma_map_single_attrs(dev, cpu_addr, size, dir, attrs) \
    - dma_map_single(dev, cpu_addr, size, dir)
    -
    -#define dma_unmap_single_attrs(dev, dma_addr, size, dir, attrs) \
    - dma_unmap_single(dev, dma_addr, size, dir)
    -
    -#define dma_map_sg_attrs(dev, sgl, nents, dir, attrs) \
    - dma_map_sg(dev, sgl, nents, dir)
    -
    -#define dma_unmap_sg_attrs(dev, sgl, nents, dir, attrs) \
    - dma_unmap_sg(dev, sgl, nents, dir)
    -
    -#endif /* CONFIG_HAVE_DMA_ATTRS */
    -
    #endif
    --
    1.6.0.GIT


    \
     
     \ /
      Last update: 2009-07-04 04:39    [W:0.025 / U:123.388 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site