diff options
author | Joe Perches <joe@perches.com> | 2008-03-23 04:02:41 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:25 -0400 |
commit | 77d511ed744f7febcd2a3444f63e6c54ac32d0c3 (patch) | |
tree | f0ec2c3ba4951f4f87e0786f6225c5c9ffa16019 | |
parent | 933a44155caeb4ff5b58fcf755e3381ae37e72d4 (diff) |
include/asm-x86/mca_dma.h: checkpatch cleanups - formatting only
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | include/asm-x86/mca_dma.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/include/asm-x86/mca_dma.h b/include/asm-x86/mca_dma.h index fbb1f3b71279..c3dca6edc6b1 100644 --- a/include/asm-x86/mca_dma.h +++ b/include/asm-x86/mca_dma.h | |||
@@ -12,18 +12,18 @@ | |||
12 | * count by 2 when using 16-bit dma; that is not handled by these functions. | 12 | * count by 2 when using 16-bit dma; that is not handled by these functions. |
13 | * | 13 | * |
14 | * Ramen Noodles are yummy. | 14 | * Ramen Noodles are yummy. |
15 | * | 15 | * |
16 | * 1998 Tymm Twillman <tymm@computer.org> | 16 | * 1998 Tymm Twillman <tymm@computer.org> |
17 | */ | 17 | */ |
18 | 18 | ||
19 | /* | 19 | /* |
20 | * Registers that are used by the DMA controller; FN is the function register | 20 | * Registers that are used by the DMA controller; FN is the function register |
21 | * (tell the controller what to do) and EXE is the execution register (how | 21 | * (tell the controller what to do) and EXE is the execution register (how |
22 | * to do it) | 22 | * to do it) |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #define MCA_DMA_REG_FN 0x18 | 25 | #define MCA_DMA_REG_FN 0x18 |
26 | #define MCA_DMA_REG_EXE 0x1A | 26 | #define MCA_DMA_REG_EXE 0x1A |
27 | 27 | ||
28 | /* | 28 | /* |
29 | * Functions that the DMA controller can do | 29 | * Functions that the DMA controller can do |
@@ -43,9 +43,9 @@ | |||
43 | 43 | ||
44 | /* | 44 | /* |
45 | * Modes (used by setting MCA_DMA_FN_MODE in the function register) | 45 | * Modes (used by setting MCA_DMA_FN_MODE in the function register) |
46 | * | 46 | * |
47 | * Note that the MODE_READ is read from memory (write to device), and | 47 | * Note that the MODE_READ is read from memory (write to device), and |
48 | * MODE_WRITE is vice-versa. | 48 | * MODE_WRITE is vice-versa. |
49 | */ | 49 | */ |
50 | 50 | ||
51 | #define MCA_DMA_MODE_XFER 0x04 /* read by default */ | 51 | #define MCA_DMA_MODE_XFER 0x04 /* read by default */ |
@@ -63,7 +63,7 @@ | |||
63 | * IRQ context. | 63 | * IRQ context. |
64 | */ | 64 | */ |
65 | 65 | ||
66 | static __inline__ void mca_enable_dma(unsigned int dmanr) | 66 | static inline void mca_enable_dma(unsigned int dmanr) |
67 | { | 67 | { |
68 | outb(MCA_DMA_FN_RESET_MASK | dmanr, MCA_DMA_REG_FN); | 68 | outb(MCA_DMA_FN_RESET_MASK | dmanr, MCA_DMA_REG_FN); |
69 | } | 69 | } |
@@ -76,7 +76,7 @@ static __inline__ void mca_enable_dma(unsigned int dmanr) | |||
76 | * IRQ context. | 76 | * IRQ context. |
77 | */ | 77 | */ |
78 | 78 | ||
79 | static __inline__ void mca_disable_dma(unsigned int dmanr) | 79 | static inline void mca_disable_dma(unsigned int dmanr) |
80 | { | 80 | { |
81 | outb(MCA_DMA_FN_MASK | dmanr, MCA_DMA_REG_FN); | 81 | outb(MCA_DMA_FN_MASK | dmanr, MCA_DMA_REG_FN); |
82 | } | 82 | } |
@@ -87,10 +87,10 @@ static __inline__ void mca_disable_dma(unsigned int dmanr) | |||
87 | * @a: 24bit bus address | 87 | * @a: 24bit bus address |
88 | * | 88 | * |
89 | * Load the address register in the DMA controller. This has a 24bit | 89 | * Load the address register in the DMA controller. This has a 24bit |
90 | * limitation (16Mb). | 90 | * limitation (16Mb). |
91 | */ | 91 | */ |
92 | 92 | ||
93 | static __inline__ void mca_set_dma_addr(unsigned int dmanr, unsigned int a) | 93 | static inline void mca_set_dma_addr(unsigned int dmanr, unsigned int a) |
94 | { | 94 | { |
95 | outb(MCA_DMA_FN_SET_ADDR | dmanr, MCA_DMA_REG_FN); | 95 | outb(MCA_DMA_FN_SET_ADDR | dmanr, MCA_DMA_REG_FN); |
96 | outb(a & 0xff, MCA_DMA_REG_EXE); | 96 | outb(a & 0xff, MCA_DMA_REG_EXE); |
@@ -106,14 +106,14 @@ static __inline__ void mca_set_dma_addr(unsigned int dmanr, unsigned int a) | |||
106 | * limitation (16Mb). The return is a bus address. | 106 | * limitation (16Mb). The return is a bus address. |
107 | */ | 107 | */ |
108 | 108 | ||
109 | static __inline__ unsigned int mca_get_dma_addr(unsigned int dmanr) | 109 | static inline unsigned int mca_get_dma_addr(unsigned int dmanr) |
110 | { | 110 | { |
111 | unsigned int addr; | 111 | unsigned int addr; |
112 | 112 | ||
113 | outb(MCA_DMA_FN_GET_ADDR | dmanr, MCA_DMA_REG_FN); | 113 | outb(MCA_DMA_FN_GET_ADDR | dmanr, MCA_DMA_REG_FN); |
114 | addr = inb(MCA_DMA_REG_EXE); | 114 | addr = inb(MCA_DMA_REG_EXE); |
115 | addr |= inb(MCA_DMA_REG_EXE) << 8; | 115 | addr |= inb(MCA_DMA_REG_EXE) << 8; |
116 | addr |= inb(MCA_DMA_REG_EXE) << 16; | 116 | addr |= inb(MCA_DMA_REG_EXE) << 16; |
117 | 117 | ||
118 | return addr; | 118 | return addr; |
119 | } | 119 | } |
@@ -127,7 +127,7 @@ static __inline__ unsigned int mca_get_dma_addr(unsigned int dmanr) | |||
127 | * Setting a count of zero will not do what you expect. | 127 | * Setting a count of zero will not do what you expect. |
128 | */ | 128 | */ |
129 | 129 | ||
130 | static __inline__ void mca_set_dma_count(unsigned int dmanr, unsigned int count) | 130 | static inline void mca_set_dma_count(unsigned int dmanr, unsigned int count) |
131 | { | 131 | { |
132 | count--; /* transfers one more than count -- correct for this */ | 132 | count--; /* transfers one more than count -- correct for this */ |
133 | 133 | ||
@@ -144,7 +144,7 @@ static __inline__ void mca_set_dma_count(unsigned int dmanr, unsigned int count) | |||
144 | * on this DMA channel. | 144 | * on this DMA channel. |
145 | */ | 145 | */ |
146 | 146 | ||
147 | static __inline__ unsigned int mca_get_dma_residue(unsigned int dmanr) | 147 | static inline unsigned int mca_get_dma_residue(unsigned int dmanr) |
148 | { | 148 | { |
149 | unsigned short count; | 149 | unsigned short count; |
150 | 150 | ||
@@ -164,12 +164,12 @@ static __inline__ unsigned int mca_get_dma_residue(unsigned int dmanr) | |||
164 | * with an I/O port target. | 164 | * with an I/O port target. |
165 | */ | 165 | */ |
166 | 166 | ||
167 | static __inline__ void mca_set_dma_io(unsigned int dmanr, unsigned int io_addr) | 167 | static inline void mca_set_dma_io(unsigned int dmanr, unsigned int io_addr) |
168 | { | 168 | { |
169 | /* | 169 | /* |
170 | * DMA from a port address -- set the io address | 170 | * DMA from a port address -- set the io address |
171 | */ | 171 | */ |
172 | 172 | ||
173 | outb(MCA_DMA_FN_SET_IO | dmanr, MCA_DMA_REG_FN); | 173 | outb(MCA_DMA_FN_SET_IO | dmanr, MCA_DMA_REG_FN); |
174 | outb(io_addr & 0xff, MCA_DMA_REG_EXE); | 174 | outb(io_addr & 0xff, MCA_DMA_REG_EXE); |
175 | outb((io_addr >> 8) & 0xff, MCA_DMA_REG_EXE); | 175 | outb((io_addr >> 8) & 0xff, MCA_DMA_REG_EXE); |
@@ -192,7 +192,7 @@ static __inline__ void mca_set_dma_io(unsigned int dmanr, unsigned int io_addr) | |||
192 | * %MCA_DMA_MODE_16 to do 16bit transfers. | 192 | * %MCA_DMA_MODE_16 to do 16bit transfers. |
193 | */ | 193 | */ |
194 | 194 | ||
195 | static __inline__ void mca_set_dma_mode(unsigned int dmanr, unsigned int mode) | 195 | static inline void mca_set_dma_mode(unsigned int dmanr, unsigned int mode) |
196 | { | 196 | { |
197 | outb(MCA_DMA_FN_SET_MODE | dmanr, MCA_DMA_REG_FN); | 197 | outb(MCA_DMA_FN_SET_MODE | dmanr, MCA_DMA_REG_FN); |
198 | outb(mode, MCA_DMA_REG_EXE); | 198 | outb(mode, MCA_DMA_REG_EXE); |