lkml.org 
[lkml]   [2016]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 25/44] h8300: 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/h8300/kernel/dma.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/h8300/kernel/dma.c b/arch/h8300/kernel/dma.c
    index eeb13d3f2424..3651da045806 100644
    --- a/arch/h8300/kernel/dma.c
    +++ b/arch/h8300/kernel/dma.c
    @@ -12,7 +12,7 @@

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

    @@ -32,7 +32,7 @@ static void *dma_alloc(struct device *dev, size_t size,

    static void dma_free(struct device *dev, size_t size,
    void *vaddr, dma_addr_t dma_handle,
    - struct dma_attrs *attrs)
    + unsigned long attrs)

    {
    free_pages((unsigned long)vaddr, get_order(size));
    @@ -41,14 +41,14 @@ static void dma_free(struct device *dev, size_t size,
    static dma_addr_t 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)
    {
    return page_to_phys(page) + offset;
    }

    static int map_sg(struct device *dev, struct scatterlist *sgl,
    int nents, enum dma_data_direction direction,
    - struct dma_attrs *attrs)
    + unsigned long attrs)
    {
    struct scatterlist *sg;
    int i;
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-06-10 12:41    [W:3.467 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site