lkml.org 
[lkml]   [2010]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -mm 11/12] mn10300: use asm-generic/scatterlist.h
    Date
    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Cc: David Howells <dhowells@redhat.com>
    Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
    ---
    arch/mn10300/include/asm/scatterlist.h | 39 +-------------------------------
    1 files changed, 1 insertions(+), 38 deletions(-)

    diff --git a/arch/mn10300/include/asm/scatterlist.h b/arch/mn10300/include/asm/scatterlist.h
    index 6753590..7bd00b9 100644
    --- a/arch/mn10300/include/asm/scatterlist.h
    +++ b/arch/mn10300/include/asm/scatterlist.h
    @@ -11,45 +11,8 @@
    #ifndef _ASM_SCATTERLIST_H
    #define _ASM_SCATTERLIST_H

    -#include <asm/types.h>
    -
    -/*
    - * Drivers must set either ->address or (preferred) page and ->offset
    - * to indicate where data must be transferred to/from.
    - *
    - * Using page is recommended since it handles highmem data as well as
    - * low mem. ->address is restricted to data which has a virtual mapping, and
    - * it will go away in the future. Updating to page can be automated very
    - * easily -- something like
    - *
    - * sg->address = some_ptr;
    - *
    - * can be rewritten as
    - *
    - * sg_set_page(virt_to_page(some_ptr));
    - * sg->offset = (unsigned long) some_ptr & ~PAGE_MASK;
    - *
    - * and that's it. There's no excuse for not highmem enabling YOUR driver. /jens
    - */
    -struct scatterlist {
    -#ifdef CONFIG_DEBUG_SG
    - unsigned long sg_magic;
    -#endif
    - unsigned long page_link;
    - unsigned int offset; /* for highmem, page offset */
    - dma_addr_t dma_address;
    - unsigned int length;
    -};
    +#include <asm-generic/scatterlist.h>

    #define ISA_DMA_THRESHOLD (0x00ffffff)

    -/*
    - * These macros should be used after a pci_map_sg call has been done
    - * to get bus addresses of each of the SG entries and their lengths.
    - * You should only work with the number of sg entries pci_map_sg
    - * returns.
    - */
    -#define sg_dma_address(sg) ((sg)->dma_address)
    -#define sg_dma_len(sg) ((sg)->length)
    -
    #endif /* _ASM_SCATTERLIST_H */
    --
    1.7.0


    \
     
     \ /
      Last update: 2010-04-06 01:59    [W:3.417 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site