diff options
author | Joe Perches <joe@perches.com> | 2012-02-19 22:52:38 -0500 |
---|---|---|
committer | Joe Perches <joe@perches.com> | 2012-02-21 12:04:01 -0500 |
commit | 475be4d85a274d0961593db41cf85689db1d583c (patch) | |
tree | b2b8931eb747794730522c3cf1898e46948527b9 /drivers/isdn/hisax/mic.c | |
parent | 0b0a635f79f91f3755b6518627ea06dd0dbfd523 (diff) |
isdn: whitespace coding style cleanup
isdn source code uses a not-current coding style.
Update the coding style used on a per-line basis
so that git diff -w shows only elided blank lines
at EOF.
Done with emacs and some scripts and some typing.
Built x86 allyesconfig.
No detected change in objdump -d or size.
Signed-off-by: Joe Perches <joe@perches.com>
Diffstat (limited to 'drivers/isdn/hisax/mic.c')
-rw-r--r-- | drivers/isdn/hisax/mic.c | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/drivers/isdn/hisax/mic.c b/drivers/isdn/hisax/mic.c index 253943029d25..08a6b7fb17f7 100644 --- a/drivers/isdn/hisax/mic.c +++ b/drivers/isdn/hisax/mic.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Author Stephan von Krawczynski | 5 | * Author Stephan von Krawczynski |
6 | * Copyright by Stephan von Krawczynski <skraw@ithnet.com> | 6 | * Copyright by Stephan von Krawczynski <skraw@ithnet.com> |
7 | * | 7 | * |
8 | * This software may be used and distributed according to the terms | 8 | * This software may be used and distributed according to the terms |
9 | * of the GNU General Public License, incorporated herein by reference. | 9 | * of the GNU General Public License, incorporated herein by reference. |
10 | * | 10 | * |
@@ -18,7 +18,7 @@ | |||
18 | 18 | ||
19 | static const char *mic_revision = "$Revision: 1.12.2.4 $"; | 19 | static const char *mic_revision = "$Revision: 1.12.2.4 $"; |
20 | 20 | ||
21 | #define byteout(addr,val) outb(val,addr) | 21 | #define byteout(addr, val) outb(val, addr) |
22 | #define bytein(addr) inb(addr) | 22 | #define bytein(addr) inb(addr) |
23 | 23 | ||
24 | #define MIC_ISAC 2 | 24 | #define MIC_ISAC 2 |
@@ -39,7 +39,7 @@ readreg(unsigned int ale, unsigned int adr, u_char off) | |||
39 | } | 39 | } |
40 | 40 | ||
41 | static inline void | 41 | static inline void |
42 | readfifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) | 42 | readfifo(unsigned int ale, unsigned int adr, u_char off, u_char *data, int size) |
43 | { | 43 | { |
44 | byteout(ale, off); | 44 | byteout(ale, off); |
45 | insb(adr, data, size); | 45 | insb(adr, data, size); |
@@ -54,7 +54,7 @@ writereg(unsigned int ale, unsigned int adr, u_char off, u_char data) | |||
54 | } | 54 | } |
55 | 55 | ||
56 | static inline void | 56 | static inline void |
57 | writefifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size) | 57 | writefifo(unsigned int ale, unsigned int adr, u_char off, u_char *data, int size) |
58 | { | 58 | { |
59 | byteout(ale, off); | 59 | byteout(ale, off); |
60 | outsb(adr, data, size); | 60 | outsb(adr, data, size); |
@@ -75,13 +75,13 @@ WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value) | |||
75 | } | 75 | } |
76 | 76 | ||
77 | static void | 77 | static void |
78 | ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) | 78 | ReadISACfifo(struct IsdnCardState *cs, u_char *data, int size) |
79 | { | 79 | { |
80 | readfifo(cs->hw.mic.adr, cs->hw.mic.isac, 0, data, size); | 80 | readfifo(cs->hw.mic.adr, cs->hw.mic.isac, 0, data, size); |
81 | } | 81 | } |
82 | 82 | ||
83 | static void | 83 | static void |
84 | WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) | 84 | WriteISACfifo(struct IsdnCardState *cs, u_char *data, int size) |
85 | { | 85 | { |
86 | writefifo(cs->hw.mic.adr, cs->hw.mic.isac, 0, data, size); | 86 | writefifo(cs->hw.mic.adr, cs->hw.mic.isac, 0, data, size); |
87 | } | 87 | } |
@@ -104,16 +104,16 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) | |||
104 | * fast interrupt HSCX stuff goes here | 104 | * fast interrupt HSCX stuff goes here |
105 | */ | 105 | */ |
106 | 106 | ||
107 | #define READHSCX(cs, nr, reg) readreg(cs->hw.mic.adr, \ | 107 | #define READHSCX(cs, nr, reg) readreg(cs->hw.mic.adr, \ |
108 | cs->hw.mic.hscx, reg + (nr ? 0x40 : 0)) | 108 | cs->hw.mic.hscx, reg + (nr ? 0x40 : 0)) |
109 | #define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.mic.adr, \ | 109 | #define WRITEHSCX(cs, nr, reg, data) writereg(cs->hw.mic.adr, \ |
110 | cs->hw.mic.hscx, reg + (nr ? 0x40 : 0), data) | 110 | cs->hw.mic.hscx, reg + (nr ? 0x40 : 0), data) |
111 | 111 | ||
112 | #define READHSCXFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.mic.adr, \ | 112 | #define READHSCXFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.mic.adr, \ |
113 | cs->hw.mic.hscx, (nr ? 0x40 : 0), ptr, cnt) | 113 | cs->hw.mic.hscx, (nr ? 0x40 : 0), ptr, cnt) |
114 | 114 | ||
115 | #define WRITEHSCXFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.mic.adr, \ | 115 | #define WRITEHSCXFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.mic.adr, \ |
116 | cs->hw.mic.hscx, (nr ? 0x40 : 0), ptr, cnt) | 116 | cs->hw.mic.hscx, (nr ? 0x40 : 0), ptr, cnt) |
117 | 117 | ||
118 | #include "hscx_irq.c" | 118 | #include "hscx_irq.c" |
119 | 119 | ||
@@ -126,11 +126,11 @@ mic_interrupt(int intno, void *dev_id) | |||
126 | 126 | ||
127 | spin_lock_irqsave(&cs->lock, flags); | 127 | spin_lock_irqsave(&cs->lock, flags); |
128 | val = readreg(cs->hw.mic.adr, cs->hw.mic.hscx, HSCX_ISTA + 0x40); | 128 | val = readreg(cs->hw.mic.adr, cs->hw.mic.hscx, HSCX_ISTA + 0x40); |
129 | Start_HSCX: | 129 | Start_HSCX: |
130 | if (val) | 130 | if (val) |
131 | hscx_int_main(cs, val); | 131 | hscx_int_main(cs, val); |
132 | val = readreg(cs->hw.mic.adr, cs->hw.mic.isac, ISAC_ISTA); | 132 | val = readreg(cs->hw.mic.adr, cs->hw.mic.isac, ISAC_ISTA); |
133 | Start_ISAC: | 133 | Start_ISAC: |
134 | if (val) | 134 | if (val) |
135 | isac_interrupt(cs, val); | 135 | isac_interrupt(cs, val); |
136 | val = readreg(cs->hw.mic.adr, cs->hw.mic.hscx, HSCX_ISTA + 0x40); | 136 | val = readreg(cs->hw.mic.adr, cs->hw.mic.hscx, HSCX_ISTA + 0x40); |
@@ -170,21 +170,21 @@ mic_card_msg(struct IsdnCardState *cs, int mt, void *arg) | |||
170 | u_long flags; | 170 | u_long flags; |
171 | 171 | ||
172 | switch (mt) { | 172 | switch (mt) { |
173 | case CARD_RESET: | 173 | case CARD_RESET: |
174 | return(0); | 174 | return (0); |
175 | case CARD_RELEASE: | 175 | case CARD_RELEASE: |
176 | release_io_mic(cs); | 176 | release_io_mic(cs); |
177 | return(0); | 177 | return (0); |
178 | case CARD_INIT: | 178 | case CARD_INIT: |
179 | spin_lock_irqsave(&cs->lock, flags); | 179 | spin_lock_irqsave(&cs->lock, flags); |
180 | inithscx(cs); /* /RTSA := ISAC RST */ | 180 | inithscx(cs); /* /RTSA := ISAC RST */ |
181 | inithscxisac(cs, 3); | 181 | inithscxisac(cs, 3); |
182 | spin_unlock_irqrestore(&cs->lock, flags); | 182 | spin_unlock_irqrestore(&cs->lock, flags); |
183 | return(0); | 183 | return (0); |
184 | case CARD_TEST: | 184 | case CARD_TEST: |
185 | return(0); | 185 | return (0); |
186 | } | 186 | } |
187 | return(0); | 187 | return (0); |
188 | } | 188 | } |
189 | 189 | ||
190 | int __devinit | 190 | int __devinit |
@@ -214,7 +214,7 @@ setup_mic(struct IsdnCard *card) | |||
214 | return (0); | 214 | return (0); |
215 | } | 215 | } |
216 | printk(KERN_INFO "mic: defined at 0x%x IRQ %d\n", | 216 | printk(KERN_INFO "mic: defined at 0x%x IRQ %d\n", |
217 | cs->hw.mic.cfg_reg, cs->irq); | 217 | cs->hw.mic.cfg_reg, cs->irq); |
218 | setup_isac(cs); | 218 | setup_isac(cs); |
219 | cs->readisac = &ReadISAC; | 219 | cs->readisac = &ReadISAC; |
220 | cs->writeisac = &WriteISAC; | 220 | cs->writeisac = &WriteISAC; |
@@ -228,7 +228,7 @@ setup_mic(struct IsdnCard *card) | |||
228 | ISACVersion(cs, "mic:"); | 228 | ISACVersion(cs, "mic:"); |
229 | if (HscxVersion(cs, "mic:")) { | 229 | if (HscxVersion(cs, "mic:")) { |
230 | printk(KERN_WARNING | 230 | printk(KERN_WARNING |
231 | "mic: wrong HSCX versions check IO address\n"); | 231 | "mic: wrong HSCX versions check IO address\n"); |
232 | release_io_mic(cs); | 232 | release_io_mic(cs); |
233 | return (0); | 233 | return (0); |
234 | } | 234 | } |