lkml.org 
[lkml]   [2016]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 33/44] nios2: dma-mapping: Use unsigned long for dma_attrs
    Date
    Split out subsystem specific changes for easier reviews. This will be
    squashed with main commit.

    Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
    ---
    arch/nios2/mm/dma-mapping.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/nios2/mm/dma-mapping.c b/arch/nios2/mm/dma-mapping.c
    index 90422c367ed3..d800fad87896 100644
    --- a/arch/nios2/mm/dma-mapping.c
    +++ b/arch/nios2/mm/dma-mapping.c
    @@ -59,7 +59,7 @@ static inline void __dma_sync_for_cpu(void *vaddr, size_t size,
    }

    static void *nios2_dma_alloc(struct device *dev, size_t size,
    - dma_addr_t *dma_handle, gfp_t gfp, struct dma_attrs *attrs)
    + dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs)
    {
    void *ret;

    @@ -84,7 +84,7 @@ static void *nios2_dma_alloc(struct device *dev, size_t size,
    }

    static void nios2_dma_free(struct device *dev, size_t size, void *vaddr,
    - dma_addr_t dma_handle, struct dma_attrs *attrs)
    + dma_addr_t dma_handle, unsigned long attrs)
    {
    unsigned long addr = (unsigned long) CAC_ADDR((unsigned long) vaddr);

    @@ -93,7 +93,7 @@ static void nios2_dma_free(struct device *dev, size_t size, void *vaddr,

    static int nios2_dma_map_sg(struct device *dev, struct scatterlist *sg,
    int nents, enum dma_data_direction direction,
    - struct dma_attrs *attrs)
    + unsigned long attrs)
    {
    int i;

    @@ -113,7 +113,7 @@ static int nios2_dma_map_sg(struct device *dev, struct scatterlist *sg,
    static dma_addr_t nios2_dma_map_page(struct device *dev, struct page *page,
    unsigned long offset, size_t size,
    enum dma_data_direction direction,
    - struct dma_attrs *attrs)
    + unsigned long attrs)
    {
    void *addr = page_address(page) + offset;

    @@ -123,14 +123,14 @@ static dma_addr_t nios2_dma_map_page(struct device *dev, struct page *page,

    static void nios2_dma_unmap_page(struct device *dev, dma_addr_t dma_address,
    size_t size, enum dma_data_direction direction,
    - struct dma_attrs *attrs)
    + unsigned long attrs)
    {
    __dma_sync_for_cpu(phys_to_virt(dma_address), size, direction);
    }

    static void nios2_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
    int nhwentries, enum dma_data_direction direction,
    - struct dma_attrs *attrs)
    + unsigned long attrs)
    {
    void *addr;
    int i;
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-06-30 11:21    [W:4.649 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site