aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/bkm_a4t.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-02-19 22:52:38 -0500
committerJoe Perches <joe@perches.com>2012-02-21 12:04:01 -0500
commit475be4d85a274d0961593db41cf85689db1d583c (patch)
treeb2b8931eb747794730522c3cf1898e46948527b9 /drivers/isdn/hisax/bkm_a4t.c
parent0b0a635f79f91f3755b6518627ea06dd0dbfd523 (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/bkm_a4t.c')
-rw-r--r--drivers/isdn/hisax/bkm_a4t.c92
1 files changed, 46 insertions, 46 deletions
diff --git a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c
index 9f2009c0b69c..f6bf9c68892e 100644
--- a/drivers/isdn/hisax/bkm_a4t.c
+++ b/drivers/isdn/hisax/bkm_a4t.c
@@ -4,7 +4,7 @@
4 * 4 *
5 * Author Roland Klabunde 5 * Author Roland Klabunde
6 * Copyright by Roland Klabunde <R.Klabunde@Berkom.de> 6 * Copyright by Roland Klabunde <R.Klabunde@Berkom.de>
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 *
@@ -39,7 +39,7 @@ readreg(unsigned int ale, unsigned long adr, u_char off)
39 39
40 40
41static inline void 41static inline void
42readfifo(unsigned int ale, unsigned long adr, u_char off, u_char * data, int size) 42readfifo(unsigned int ale, unsigned long adr, u_char off, u_char *data, int size)
43{ 43{
44 int i; 44 int i;
45 for (i = 0; i < size; i++) 45 for (i = 0; i < size; i++)
@@ -59,7 +59,7 @@ writereg(unsigned int ale, unsigned long adr, u_char off, u_char data)
59 59
60 60
61static inline void 61static inline void
62writefifo(unsigned int ale, unsigned long adr, u_char off, u_char * data, int size) 62writefifo(unsigned int ale, unsigned long adr, u_char off, u_char *data, int size)
63{ 63{
64 int i; 64 int i;
65 65
@@ -83,13 +83,13 @@ WriteISAC(struct IsdnCardState *cs, u_char offset, u_char value)
83} 83}
84 84
85static void 85static void
86ReadISACfifo(struct IsdnCardState *cs, u_char * data, int size) 86ReadISACfifo(struct IsdnCardState *cs, u_char *data, int size)
87{ 87{
88 readfifo(cs->hw.ax.isac_ale, cs->hw.ax.isac_adr, 0, data, size); 88 readfifo(cs->hw.ax.isac_ale, cs->hw.ax.isac_adr, 0, data, size);
89} 89}
90 90
91static void 91static void
92WriteISACfifo(struct IsdnCardState *cs, u_char * data, int size) 92WriteISACfifo(struct IsdnCardState *cs, u_char *data, int size)
93{ 93{
94 writefifo(cs->hw.ax.isac_ale, cs->hw.ax.isac_adr, 0, data, size); 94 writefifo(cs->hw.ax.isac_ale, cs->hw.ax.isac_adr, 0, data, size);
95} 95}
@@ -110,15 +110,15 @@ WriteJADE(struct IsdnCardState *cs, int jade, u_char offset, u_char value)
110 * fast interrupt JADE stuff goes here 110 * fast interrupt JADE stuff goes here
111 */ 111 */
112 112
113#define READJADE(cs, nr, reg) readreg(cs->hw.ax.jade_ale,\ 113#define READJADE(cs, nr, reg) readreg(cs->hw.ax.jade_ale, \
114 cs->hw.ax.jade_adr, reg + (nr == -1 ? 0 : (nr ? 0xC0 : 0x80))) 114 cs->hw.ax.jade_adr, reg + (nr == -1 ? 0 : (nr ? 0xC0 : 0x80)))
115#define WRITEJADE(cs, nr, reg, data) writereg(cs->hw.ax.jade_ale,\ 115#define WRITEJADE(cs, nr, reg, data) writereg(cs->hw.ax.jade_ale, \
116 cs->hw.ax.jade_adr, reg + (nr == -1 ? 0 : (nr ? 0xC0 : 0x80)), data) 116 cs->hw.ax.jade_adr, reg + (nr == -1 ? 0 : (nr ? 0xC0 : 0x80)), data)
117 117
118#define READJADEFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.ax.jade_ale,\ 118#define READJADEFIFO(cs, nr, ptr, cnt) readfifo(cs->hw.ax.jade_ale, \
119 cs->hw.ax.jade_adr, (nr == -1 ? 0 : (nr ? 0xC0 : 0x80)), ptr, cnt) 119 cs->hw.ax.jade_adr, (nr == -1 ? 0 : (nr ? 0xC0 : 0x80)), ptr, cnt)
120#define WRITEJADEFIFO(cs, nr, ptr, cnt) writefifo( cs->hw.ax.jade_ale,\ 120#define WRITEJADEFIFO(cs, nr, ptr, cnt) writefifo(cs->hw.ax.jade_ale, \
121 cs->hw.ax.jade_adr, (nr == -1 ? 0 : (nr ? 0xC0 : 0x80)), ptr, cnt) 121 cs->hw.ax.jade_adr, (nr == -1 ? 0 : (nr ? 0xC0 : 0x80)), ptr, cnt)
122 122
123#include "jade_irq.c" 123#include "jade_irq.c"
124 124
@@ -201,11 +201,11 @@ reset_bkm(struct IsdnCardState *cs)
201 pI20_Regs->i20SysControl = sysRESET | sysCFG; 201 pI20_Regs->i20SysControl = sysRESET | sysCFG;
202 /* Issue ISDN reset */ 202 /* Issue ISDN reset */
203 pI20_Regs->i20GuestControl = guestWAIT_CFG | 203 pI20_Regs->i20GuestControl = guestWAIT_CFG |
204 g_A4T_JADE_RES | 204 g_A4T_JADE_RES |
205 g_A4T_ISAR_RES | 205 g_A4T_ISAR_RES |
206 g_A4T_ISAC_RES | 206 g_A4T_ISAC_RES |
207 g_A4T_JADE_BOOTR | 207 g_A4T_JADE_BOOTR |
208 g_A4T_ISAR_BOOTR; 208 g_A4T_ISAR_BOOTR;
209 mdelay(10); 209 mdelay(10);
210 210
211 /* Remove RESET state from ISDN */ 211 /* Remove RESET state from ISDN */
@@ -222,33 +222,33 @@ BKM_card_msg(struct IsdnCardState *cs, int mt, void *arg)
222 u_long flags; 222 u_long flags;
223 223
224 switch (mt) { 224 switch (mt) {
225 case CARD_RESET: 225 case CARD_RESET:
226 /* Disable ints */ 226 /* Disable ints */
227 spin_lock_irqsave(&cs->lock, flags); 227 spin_lock_irqsave(&cs->lock, flags);
228 enable_bkm_int(cs, 0); 228 enable_bkm_int(cs, 0);
229 reset_bkm(cs); 229 reset_bkm(cs);
230 spin_unlock_irqrestore(&cs->lock, flags); 230 spin_unlock_irqrestore(&cs->lock, flags);
231 return (0); 231 return (0);
232 case CARD_RELEASE: 232 case CARD_RELEASE:
233 /* Sanity */ 233 /* Sanity */
234 spin_lock_irqsave(&cs->lock, flags); 234 spin_lock_irqsave(&cs->lock, flags);
235 enable_bkm_int(cs, 0); 235 enable_bkm_int(cs, 0);
236 reset_bkm(cs); 236 reset_bkm(cs);
237 spin_unlock_irqrestore(&cs->lock, flags); 237 spin_unlock_irqrestore(&cs->lock, flags);
238 release_io_bkm(cs); 238 release_io_bkm(cs);
239 return (0); 239 return (0);
240 case CARD_INIT: 240 case CARD_INIT:
241 spin_lock_irqsave(&cs->lock, flags); 241 spin_lock_irqsave(&cs->lock, flags);
242 clear_pending_isac_ints(cs); 242 clear_pending_isac_ints(cs);
243 clear_pending_jade_ints(cs); 243 clear_pending_jade_ints(cs);
244 initisac(cs); 244 initisac(cs);
245 initjade(cs); 245 initjade(cs);
246 /* Enable ints */ 246 /* Enable ints */
247 enable_bkm_int(cs, 1); 247 enable_bkm_int(cs, 1);
248 spin_unlock_irqrestore(&cs->lock, flags); 248 spin_unlock_irqrestore(&cs->lock, flags);
249 return (0); 249 return (0);
250 case CARD_TEST: 250 case CARD_TEST:
251 return (0); 251 return (0);
252 } 252 }
253 return (0); 253 return (0);
254} 254}
@@ -341,7 +341,7 @@ setup_bkm_a4t(struct IsdnCard *card)
341 return (0); 341 return (0);
342 342
343 while ((dev_a4t = hisax_find_pci_device(PCI_VENDOR_ID_ZORAN, 343 while ((dev_a4t = hisax_find_pci_device(PCI_VENDOR_ID_ZORAN,
344 PCI_DEVICE_ID_ZORAN_36120, dev_a4t))) { 344 PCI_DEVICE_ID_ZORAN_36120, dev_a4t))) {
345 ret = a4t_pci_probe(dev_a4t, cs, &found, &pci_memaddr); 345 ret = a4t_pci_probe(dev_a4t, cs, &found, &pci_memaddr);
346 if (!ret) 346 if (!ret)
347 return (0); 347 return (0);