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 42/44] xtensa: 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/xtensa/kernel/pci-dma.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/xtensa/kernel/pci-dma.c b/arch/xtensa/kernel/pci-dma.c
    index cd66698348ca..1e68806d6695 100644
    --- a/arch/xtensa/kernel/pci-dma.c
    +++ b/arch/xtensa/kernel/pci-dma.c
    @@ -142,7 +142,7 @@ static void xtensa_sync_sg_for_device(struct device *dev,

    static void *xtensa_dma_alloc(struct device *dev, size_t size,
    dma_addr_t *handle, gfp_t flag,
    - struct dma_attrs *attrs)
    + unsigned long attrs)
    {
    unsigned long ret;
    unsigned long uncached = 0;
    @@ -171,7 +171,7 @@ static void *xtensa_dma_alloc(struct device *dev, size_t size,
    }

    static void xtensa_dma_free(struct device *hwdev, 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)vaddr +
    XCHAL_KSEG_CACHED_VADDR - XCHAL_KSEG_BYPASS_VADDR;
    @@ -185,7 +185,7 @@ static void xtensa_dma_free(struct device *hwdev, size_t size, void *vaddr,
    static dma_addr_t xtensa_map_page(struct device *dev, struct page *page,
    unsigned long offset, size_t size,
    enum dma_data_direction dir,
    - struct dma_attrs *attrs)
    + unsigned long attrs)
    {
    dma_addr_t dma_handle = page_to_phys(page) + offset;

    @@ -195,14 +195,14 @@ static dma_addr_t xtensa_map_page(struct device *dev, struct page *page,

    static void xtensa_unmap_page(struct device *dev, dma_addr_t dma_handle,
    size_t size, enum dma_data_direction dir,
    - struct dma_attrs *attrs)
    + unsigned long attrs)
    {
    xtensa_sync_single_for_cpu(dev, dma_handle, size, dir);
    }

    static int xtensa_map_sg(struct device *dev, struct scatterlist *sg,
    int nents, enum dma_data_direction dir,
    - struct dma_attrs *attrs)
    + unsigned long attrs)
    {
    struct scatterlist *s;
    int i;
    @@ -217,7 +217,7 @@ static int xtensa_map_sg(struct device *dev, struct scatterlist *sg,
    static void xtensa_unmap_sg(struct device *dev,
    struct scatterlist *sg, int nents,
    enum dma_data_direction dir,
    - struct dma_attrs *attrs)
    + unsigned long attrs)
    {
    struct scatterlist *s;
    int i;
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-06-10 12:41    [W:3.293 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site