lkml.org 
[lkml]   [2014]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/4] arm64: use generic dma-contiguous.h
    Date
    dma-contiguous.h is now in asm-generic. Use that to avoid code
    repetition in arm64.

    Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
    ---
    arch/arm64/include/asm/Kbuild | 1 +
    arch/arm64/include/asm/dma-contiguous.h | 28 ----------------------------
    2 files changed, 1 insertion(+), 28 deletions(-)
    delete mode 100644 arch/arm64/include/asm/dma-contiguous.h

    diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild
    index 0b3fcf8..92bf7cb 100644
    --- a/arch/arm64/include/asm/Kbuild
    +++ b/arch/arm64/include/asm/Kbuild
    @@ -9,6 +9,7 @@ generic-y += current.h
    generic-y += delay.h
    generic-y += div64.h
    generic-y += dma.h
    +generic-y += dma-contiguous.h
    generic-y += emergency-restart.h
    generic-y += early_ioremap.h
    generic-y += errno.h
    diff --git a/arch/arm64/include/asm/dma-contiguous.h b/arch/arm64/include/asm/dma-contiguous.h
    deleted file mode 100644
    index 14c4c0c..0000000
    --- a/arch/arm64/include/asm/dma-contiguous.h
    +++ /dev/null
    @@ -1,28 +0,0 @@
    -/*
    - * Copyright (c) 2013, The Linux Foundation. All rights reserved.
    - *
    - * This program is free software; you can redistribute it and/or modify
    - * it under the terms of the GNU General Public License version 2 and
    - * only version 2 as published by the Free Software Foundation.
    - *
    - * This program is distributed in the hope that it will be useful,
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    - * GNU General Public License for more details.
    - */
    -
    -#ifndef _ASM_DMA_CONTIGUOUS_H
    -#define _ASM_DMA_CONTIGUOUS_H
    -
    -#ifdef __KERNEL__
    -#ifdef CONFIG_DMA_CMA
    -
    -#include <linux/types.h>
    -
    -static inline void
    -dma_contiguous_early_fixup(phys_addr_t base, unsigned long size) { }
    -
    -#endif
    -#endif
    -
    -#endif
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-07-19 17:21    [W:3.655 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site