lkml.org 
[lkml]   [2018]   [Jan]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 17/34] microblaze: remove dma_nommu_dma_supported
    Date
    Always returning 1 is the same behavior as not supplying a method at all.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    arch/microblaze/kernel/dma.c | 6 ------
    arch/parisc/kernel/pci-dma.c | 7 -------
    2 files changed, 13 deletions(-)

    diff --git a/arch/microblaze/kernel/dma.c b/arch/microblaze/kernel/dma.c
    index 450803e5731a..b45d8f8967af 100644
    --- a/arch/microblaze/kernel/dma.c
    +++ b/arch/microblaze/kernel/dma.c
    @@ -89,11 +89,6 @@ static int dma_nommu_map_sg(struct device *dev, struct scatterlist *sgl,
    return nents;
    }

    -static int dma_nommu_dma_supported(struct device *dev, u64 mask)
    -{
    - return 1;
    -}
    -
    static inline dma_addr_t dma_nommu_map_page(struct device *dev,
    struct page *page,
    unsigned long offset,
    @@ -209,7 +204,6 @@ const struct dma_map_ops dma_nommu_ops = {
    .free = dma_nommu_free_coherent,
    .mmap = dma_nommu_mmap_coherent,
    .map_sg = dma_nommu_map_sg,
    - .dma_supported = dma_nommu_dma_supported,
    .map_page = dma_nommu_map_page,
    .unmap_page = dma_nommu_unmap_page,
    .sync_single_for_cpu = dma_nommu_sync_single_for_cpu,
    diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c
    index c0dfd892f70c..91bc0cac03a1 100644
    --- a/arch/parisc/kernel/pci-dma.c
    +++ b/arch/parisc/kernel/pci-dma.c
    @@ -75,11 +75,6 @@ void dump_resmap(void)
    static inline void dump_resmap(void) {;}
    #endif

    -static int pa11_dma_supported( struct device *dev, u64 mask)
    -{
    - return 1;
    -}
    -
    static inline int map_pte_uncached(pte_t * pte,
    unsigned long vaddr,
    unsigned long size, unsigned long *paddr_ptr)
    @@ -579,7 +574,6 @@ static void pa11_dma_cache_sync(struct device *dev, void *vaddr, size_t size,
    }

    const struct dma_map_ops pcxl_dma_ops = {
    - .dma_supported = pa11_dma_supported,
    .alloc = pa11_dma_alloc,
    .free = pa11_dma_free,
    .map_page = pa11_dma_map_page,
    @@ -616,7 +610,6 @@ static void pcx_dma_free(struct device *dev, size_t size, void *vaddr,
    }

    const struct dma_map_ops pcx_dma_ops = {
    - .dma_supported = pa11_dma_supported,
    .alloc = pcx_dma_alloc,
    .free = pcx_dma_free,
    .map_page = pa11_dma_map_page,
    --
    2.14.2
    \
     
     \ /
      Last update: 2018-01-14 23:25    [W:4.166 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site