[ARM] 3765/1: S3C24XX: cleanup include/asm-arm/arch-s3c2410/dma.h

Patch from Ben Dooks

Cleanup for include/asm-arma/arch-s3c2410/dma.h,
by using tab characters to indent items, remove the
now un-necessary changelog, and update the copyright
information.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by Ben Dooks and committed by Russell King 57bcdafc f105a7df

+41 -49
+41 -49
include/asm-arm/arch-s3c2410/dma.h
··· 1 - /* linux/include/asm-arm/arch-bast/dma.h 2 * 3 - * Copyright (C) 2003,2004 Simtec Electronics 4 * Ben Dooks <ben@simtec.co.uk> 5 * 6 - * Samsung S3C2410X DMA support 7 * 8 * This program is free software; you can redistribute it and/or modify 9 * it under the terms of the GNU General Public License version 2 as 10 * published by the Free Software Foundation. 11 - * 12 - * Changelog: 13 - * ??-May-2003 BJD Created file 14 - * ??-Jun-2003 BJD Added more dma functionality to go with arch 15 - * 10-Nov-2004 BJD Added sys_device support 16 */ 17 18 #ifndef __ASM_ARCH_DMA_H ··· 16 #include <linux/sysdev.h> 17 #include "hardware.h" 18 19 - 20 /* 21 * This is the maximum DMA address(physical address) that can be DMAd to. 22 * 23 */ 24 - #define MAX_DMA_ADDRESS 0x20000000 25 #define MAX_DMA_TRANSFER_SIZE 0x100000 /* Data Unit is half word */ 26 - 27 28 /* we have 4 dma channels */ 29 #define S3C2410_DMA_CHANNELS (4) ··· 76 S3C2410_RES_ABORT 77 }; 78 79 - 80 enum s3c2410_dmasrc { 81 - S3C2410_DMASRC_HW, /* source is memory */ 82 - S3C2410_DMASRC_MEM /* source is hardware */ 83 }; 84 85 /* enum s3c2410_chan_op ··· 93 S3C2410_DMAOP_PAUSE, 94 S3C2410_DMAOP_RESUME, 95 S3C2410_DMAOP_FLUSH, 96 - S3C2410_DMAOP_TIMEOUT, /* internal signal to handler */ 97 S3C2410_DMAOP_STARTED, /* indicate channel started */ 98 }; 99 ··· 117 118 struct s3c2410_dma_buf; 119 struct s3c2410_dma_buf { 120 - struct s3c2410_dma_buf *next; 121 - int magic; /* magic */ 122 - int size; /* buffer size in bytes */ 123 - dma_addr_t data; /* start of DMA data */ 124 - dma_addr_t ptr; /* where the DMA got to [1] */ 125 - void *id; /* client's id */ 126 }; 127 128 /* [1] is this updated for both recv/send modes? */ ··· 142 enum s3c2410_chan_op ); 143 144 struct s3c2410_dma_stats { 145 - unsigned long loads; 146 - unsigned long timeout_longest; 147 - unsigned long timeout_shortest; 148 - unsigned long timeout_avg; 149 - unsigned long timeout_failed; 150 }; 151 152 /* struct s3c2410_dma_chan ··· 156 157 struct s3c2410_dma_chan { 158 /* channel state flags and information */ 159 - unsigned char number; /* number of this dma channel */ 160 - unsigned char in_use; /* channel allocated */ 161 - unsigned char irq_claimed; /* irq claimed for channel */ 162 - unsigned char irq_enabled; /* irq enabled for channel */ 163 - unsigned char xfer_unit; /* size of an transfer */ 164 165 /* channel state */ 166 167 - enum s3c2410_dma_state state; 168 - enum s3c2410_dma_loadst load_state; 169 - struct s3c2410_dma_client *client; 170 171 /* channel configuration */ 172 - enum s3c2410_dmasrc source; 173 - unsigned long dev_addr; 174 - unsigned long load_timeout; 175 - unsigned int flags; /* channel flags */ 176 177 /* channel's hardware position and configuration */ 178 - void __iomem *regs; /* channels registers */ 179 - void __iomem *addr_reg; /* data address register */ 180 - unsigned int irq; /* channel irq */ 181 - unsigned long dcon; /* default value of DCON */ 182 183 /* driver handles */ 184 - s3c2410_dma_cbfn_t callback_fn; /* buffer done callback */ 185 - s3c2410_dma_opfn_t op_fn; /* channel operation callback */ 186 187 /* stats gathering */ 188 - struct s3c2410_dma_stats *stats; 189 - struct s3c2410_dma_stats stats_store; 190 191 /* buffer list and information */ 192 - struct s3c2410_dma_buf *curr; /* current dma buffer */ 193 - struct s3c2410_dma_buf *next; /* next buffer to load */ 194 - struct s3c2410_dma_buf *end; /* end of queue */ 195 196 /* system device */ 197 struct sys_device dev;
··· 1 + /* linux/include/asm-arm/arch-s3c2410/dma.h 2 * 3 + * Copyright (C) 2003,2004,2006 Simtec Electronics 4 * Ben Dooks <ben@simtec.co.uk> 5 * 6 + * Samsung S3C241XX DMA support 7 * 8 * This program is free software; you can redistribute it and/or modify 9 * it under the terms of the GNU General Public License version 2 as 10 * published by the Free Software Foundation. 11 */ 12 13 #ifndef __ASM_ARCH_DMA_H ··· 21 #include <linux/sysdev.h> 22 #include "hardware.h" 23 24 /* 25 * This is the maximum DMA address(physical address) that can be DMAd to. 26 * 27 */ 28 + #define MAX_DMA_ADDRESS 0x40000000 29 #define MAX_DMA_TRANSFER_SIZE 0x100000 /* Data Unit is half word */ 30 31 /* we have 4 dma channels */ 32 #define S3C2410_DMA_CHANNELS (4) ··· 83 S3C2410_RES_ABORT 84 }; 85 86 enum s3c2410_dmasrc { 87 + S3C2410_DMASRC_HW, /* source is memory */ 88 + S3C2410_DMASRC_MEM /* source is hardware */ 89 }; 90 91 /* enum s3c2410_chan_op ··· 101 S3C2410_DMAOP_PAUSE, 102 S3C2410_DMAOP_RESUME, 103 S3C2410_DMAOP_FLUSH, 104 + S3C2410_DMAOP_TIMEOUT, /* internal signal to handler */ 105 S3C2410_DMAOP_STARTED, /* indicate channel started */ 106 }; 107 ··· 125 126 struct s3c2410_dma_buf; 127 struct s3c2410_dma_buf { 128 + struct s3c2410_dma_buf *next; 129 + int magic; /* magic */ 130 + int size; /* buffer size in bytes */ 131 + dma_addr_t data; /* start of DMA data */ 132 + dma_addr_t ptr; /* where the DMA got to [1] */ 133 + void *id; /* client's id */ 134 }; 135 136 /* [1] is this updated for both recv/send modes? */ ··· 150 enum s3c2410_chan_op ); 151 152 struct s3c2410_dma_stats { 153 + unsigned long loads; 154 + unsigned long timeout_longest; 155 + unsigned long timeout_shortest; 156 + unsigned long timeout_avg; 157 + unsigned long timeout_failed; 158 }; 159 160 /* struct s3c2410_dma_chan ··· 164 165 struct s3c2410_dma_chan { 166 /* channel state flags and information */ 167 + unsigned char number; /* number of this dma channel */ 168 + unsigned char in_use; /* channel allocated */ 169 + unsigned char irq_claimed; /* irq claimed for channel */ 170 + unsigned char irq_enabled; /* irq enabled for channel */ 171 + unsigned char xfer_unit; /* size of an transfer */ 172 173 /* channel state */ 174 175 + enum s3c2410_dma_state state; 176 + enum s3c2410_dma_loadst load_state; 177 + struct s3c2410_dma_client *client; 178 179 /* channel configuration */ 180 + enum s3c2410_dmasrc source; 181 + unsigned long dev_addr; 182 + unsigned long load_timeout; 183 + unsigned int flags; /* channel flags */ 184 185 /* channel's hardware position and configuration */ 186 + void __iomem *regs; /* channels registers */ 187 + void __iomem *addr_reg; /* data address register */ 188 + unsigned int irq; /* channel irq */ 189 + unsigned long dcon; /* default value of DCON */ 190 191 /* driver handles */ 192 + s3c2410_dma_cbfn_t callback_fn; /* buffer done callback */ 193 + s3c2410_dma_opfn_t op_fn; /* channel op callback */ 194 195 /* stats gathering */ 196 + struct s3c2410_dma_stats *stats; 197 + struct s3c2410_dma_stats stats_store; 198 199 /* buffer list and information */ 200 + struct s3c2410_dma_buf *curr; /* current dma buffer */ 201 + struct s3c2410_dma_buf *next; /* next buffer to load */ 202 + struct s3c2410_dma_buf *end; /* end of queue */ 203 204 /* system device */ 205 struct sys_device dev;