aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/nj_s.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/nj_s.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/nj_s.c')
-rw-r--r--drivers/isdn/hisax/nj_s.c112
1 files changed, 56 insertions, 56 deletions
diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c
index a1b89524b505..f36ff69c07e1 100644
--- a/drivers/isdn/hisax/nj_s.c
+++ b/drivers/isdn/hisax/nj_s.c
@@ -18,7 +18,7 @@ static const char *NETjet_S_revision = "$Revision: 2.13.2.4 $";
18 18
19static u_char dummyrr(struct IsdnCardState *cs, int chan, u_char off) 19static u_char dummyrr(struct IsdnCardState *cs, int chan, u_char off)
20{ 20{
21 return(5); 21 return (5);
22} 22}
23 23
24static void dummywr(struct IsdnCardState *cs, int chan, u_char off, u_char value) 24static void dummywr(struct IsdnCardState *cs, int chan, u_char off, u_char value)
@@ -46,48 +46,48 @@ netjet_s_interrupt(int intno, void *dev_id)
46 s1val = 1; 46 s1val = 1;
47 } else 47 } else
48 s1val = 0; 48 s1val = 0;
49 /* 49 /*
50 * read/write stat0 is better, because lower IRQ rate 50 * read/write stat0 is better, because lower IRQ rate
51 * Note the IRQ is on for 125 us if a condition match 51 * Note the IRQ is on for 125 us if a condition match
52 * thats long on modern CPU and so the IRQ is reentered 52 * thats long on modern CPU and so the IRQ is reentered
53 * all the time. 53 * all the time.
54 */ 54 */
55 s0val = bytein(cs->hw.njet.base + NETJET_IRQSTAT0); 55 s0val = bytein(cs->hw.njet.base + NETJET_IRQSTAT0);
56 if ((s0val | s1val)==0) { // shared IRQ 56 if ((s0val | s1val) == 0) { // shared IRQ
57 spin_unlock_irqrestore(&cs->lock, flags); 57 spin_unlock_irqrestore(&cs->lock, flags);
58 return IRQ_NONE; 58 return IRQ_NONE;
59 } 59 }
60 if (s0val) 60 if (s0val)
61 byteout(cs->hw.njet.base + NETJET_IRQSTAT0, s0val); 61 byteout(cs->hw.njet.base + NETJET_IRQSTAT0, s0val);
62 /* start new code 13/07/00 GE */ 62 /* start new code 13/07/00 GE */
63 /* set bits in sval to indicate which page is free */ 63 /* set bits in sval to indicate which page is free */
64 if (inl(cs->hw.njet.base + NETJET_DMA_WRITE_ADR) < 64 if (inl(cs->hw.njet.base + NETJET_DMA_WRITE_ADR) <
65 inl(cs->hw.njet.base + NETJET_DMA_WRITE_IRQ)) 65 inl(cs->hw.njet.base + NETJET_DMA_WRITE_IRQ))
66 /* the 2nd write page is free */ 66 /* the 2nd write page is free */
67 s0val = 0x08; 67 s0val = 0x08;
68 else /* the 1st write page is free */ 68 else /* the 1st write page is free */
69 s0val = 0x04; 69 s0val = 0x04;
70 if (inl(cs->hw.njet.base + NETJET_DMA_READ_ADR) < 70 if (inl(cs->hw.njet.base + NETJET_DMA_READ_ADR) <
71 inl(cs->hw.njet.base + NETJET_DMA_READ_IRQ)) 71 inl(cs->hw.njet.base + NETJET_DMA_READ_IRQ))
72 /* the 2nd read page is free */ 72 /* the 2nd read page is free */
73 s0val |= 0x02; 73 s0val |= 0x02;
74 else /* the 1st read page is free */ 74 else /* the 1st read page is free */
75 s0val |= 0x01; 75 s0val |= 0x01;
76 if (s0val != cs->hw.njet.last_is0) /* we have a DMA interrupt */ 76 if (s0val != cs->hw.njet.last_is0) /* we have a DMA interrupt */
77 { 77 {
78 if (test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { 78 if (test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) {
79 printk(KERN_WARNING "nj LOCK_ATOMIC s0val %x->%x\n", 79 printk(KERN_WARNING "nj LOCK_ATOMIC s0val %x->%x\n",
80 cs->hw.njet.last_is0, s0val); 80 cs->hw.njet.last_is0, s0val);
81 spin_unlock_irqrestore(&cs->lock, flags); 81 spin_unlock_irqrestore(&cs->lock, flags);
82 return IRQ_HANDLED; 82 return IRQ_HANDLED;
83 } 83 }
84 cs->hw.njet.irqstat0 = s0val; 84 cs->hw.njet.irqstat0 = s0val;
85 if ((cs->hw.njet.irqstat0 & NETJET_IRQM0_READ) != 85 if ((cs->hw.njet.irqstat0 & NETJET_IRQM0_READ) !=
86 (cs->hw.njet.last_is0 & NETJET_IRQM0_READ)) 86 (cs->hw.njet.last_is0 & NETJET_IRQM0_READ))
87 /* we have a read dma int */ 87 /* we have a read dma int */
88 read_tiger(cs); 88 read_tiger(cs);
89 if ((cs->hw.njet.irqstat0 & NETJET_IRQM0_WRITE) != 89 if ((cs->hw.njet.irqstat0 & NETJET_IRQM0_WRITE) !=
90 (cs->hw.njet.last_is0 & NETJET_IRQM0_WRITE)) 90 (cs->hw.njet.last_is0 & NETJET_IRQM0_WRITE))
91 /* we have a write dma int */ 91 /* we have a write dma int */
92 write_tiger(cs); 92 write_tiger(cs);
93 /* end new code 13/07/00 GE */ 93 /* end new code 13/07/00 GE */
@@ -124,28 +124,28 @@ NETjet_S_card_msg(struct IsdnCardState *cs, int mt, void *arg)
124 u_long flags; 124 u_long flags;
125 125
126 switch (mt) { 126 switch (mt) {
127 case CARD_RESET: 127 case CARD_RESET:
128 spin_lock_irqsave(&cs->lock, flags); 128 spin_lock_irqsave(&cs->lock, flags);
129 reset_netjet_s(cs); 129 reset_netjet_s(cs);
130 spin_unlock_irqrestore(&cs->lock, flags); 130 spin_unlock_irqrestore(&cs->lock, flags);
131 return(0); 131 return (0);
132 case CARD_RELEASE: 132 case CARD_RELEASE:
133 release_io_netjet(cs); 133 release_io_netjet(cs);
134 return(0); 134 return (0);
135 case CARD_INIT: 135 case CARD_INIT:
136 reset_netjet_s(cs); 136 reset_netjet_s(cs);
137 inittiger(cs); 137 inittiger(cs);
138 spin_lock_irqsave(&cs->lock, flags); 138 spin_lock_irqsave(&cs->lock, flags);
139 clear_pending_isac_ints(cs); 139 clear_pending_isac_ints(cs);
140 initisac(cs); 140 initisac(cs);
141 /* Reenable all IRQ */ 141 /* Reenable all IRQ */
142 cs->writeisac(cs, ISAC_MASK, 0); 142 cs->writeisac(cs, ISAC_MASK, 0);
143 spin_unlock_irqrestore(&cs->lock, flags); 143 spin_unlock_irqrestore(&cs->lock, flags);
144 return(0); 144 return (0);
145 case CARD_TEST: 145 case CARD_TEST:
146 return(0); 146 return (0);
147 } 147 }
148 return(0); 148 return (0);
149} 149}
150 150
151static int __devinit njs_pci_probe(struct pci_dev *dev_netjet, 151static int __devinit njs_pci_probe(struct pci_dev *dev_netjet,
@@ -154,17 +154,17 @@ static int __devinit njs_pci_probe(struct pci_dev *dev_netjet,
154 u32 cfg; 154 u32 cfg;
155 155
156 if (pci_enable_device(dev_netjet)) 156 if (pci_enable_device(dev_netjet))
157 return(0); 157 return (0);
158 pci_set_master(dev_netjet); 158 pci_set_master(dev_netjet);
159 cs->irq = dev_netjet->irq; 159 cs->irq = dev_netjet->irq;
160 if (!cs->irq) { 160 if (!cs->irq) {
161 printk(KERN_WARNING "NETjet-S: No IRQ for PCI card found\n"); 161 printk(KERN_WARNING "NETjet-S: No IRQ for PCI card found\n");
162 return(0); 162 return (0);
163 } 163 }
164 cs->hw.njet.base = pci_resource_start(dev_netjet, 0); 164 cs->hw.njet.base = pci_resource_start(dev_netjet, 0);
165 if (!cs->hw.njet.base) { 165 if (!cs->hw.njet.base) {
166 printk(KERN_WARNING "NETjet-S: No IO-Adr for PCI card found\n"); 166 printk(KERN_WARNING "NETjet-S: No IO-Adr for PCI card found\n");
167 return(0); 167 return (0);
168 } 168 }
169 /* the TJ300 and TJ320 must be detected, the IRQ handling is different 169 /* the TJ300 and TJ320 must be detected, the IRQ handling is different
170 * unfortunately the chips use the same device ID, but the TJ320 has 170 * unfortunately the chips use the same device ID, but the TJ320 has
@@ -177,14 +177,14 @@ static int __devinit njs_pci_probe(struct pci_dev *dev_netjet,
177 cs->subtyp = 0; /* TJ300 */ 177 cs->subtyp = 0; /* TJ300 */
178 /* 2001/10/04 Christoph Ersfeld, Formula-n Europe AG www.formula-n.com */ 178 /* 2001/10/04 Christoph Ersfeld, Formula-n Europe AG www.formula-n.com */
179 if ((dev_netjet->subsystem_vendor == 0x55) && 179 if ((dev_netjet->subsystem_vendor == 0x55) &&
180 (dev_netjet->subsystem_device == 0x02)) { 180 (dev_netjet->subsystem_device == 0x02)) {
181 printk(KERN_WARNING "Netjet: You tried to load this driver with an incompatible TigerJet-card\n"); 181 printk(KERN_WARNING "Netjet: You tried to load this driver with an incompatible TigerJet-card\n");
182 printk(KERN_WARNING "Use type=41 for Formula-n enter:now ISDN PCI and compatible\n"); 182 printk(KERN_WARNING "Use type=41 for Formula-n enter:now ISDN PCI and compatible\n");
183 return(0); 183 return (0);
184 } 184 }
185 /* end new code */ 185 /* end new code */
186 186
187 return(1); 187 return (1);
188} 188}
189 189
190static int __devinit njs_cs_init(struct IsdnCard *card, 190static int __devinit njs_cs_init(struct IsdnCard *card,
@@ -209,18 +209,18 @@ static int __devinit njs_cs_init(struct IsdnCard *card,
209 byteout(cs->hw.njet.base + NETJET_IRQMASK1, NETJET_ISACIRQ); 209 byteout(cs->hw.njet.base + NETJET_IRQMASK1, NETJET_ISACIRQ);
210 byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); 210 byteout(cs->hw.njet.auxa, cs->hw.njet.auxd);
211 211
212 switch ( ( ( NETjet_ReadIC( cs, ISAC_RBCH ) >> 5 ) & 3 ) ) 212 switch (((NETjet_ReadIC(cs, ISAC_RBCH) >> 5) & 3))
213 { 213 {
214 case 0 : 214 case 0:
215 return 1; /* end loop */ 215 return 1; /* end loop */
216 216
217 case 3 : 217 case 3:
218 printk( KERN_WARNING "NETjet-S: NETspider-U PCI card found\n" ); 218 printk(KERN_WARNING "NETjet-S: NETspider-U PCI card found\n");
219 return -1; /* continue looping */ 219 return -1; /* continue looping */
220 220
221 default : 221 default:
222 printk( KERN_WARNING "NETjet-S: No PCI card found\n" ); 222 printk(KERN_WARNING "NETjet-S: No PCI card found\n");
223 return 0; /* end loop & function */ 223 return 0; /* end loop & function */
224 } 224 }
225 return 1; /* end loop */ 225 return 1; /* end loop */
226} 226}
@@ -231,8 +231,8 @@ static int __devinit njs_cs_init_rest(struct IsdnCard *card,
231 const int bytecnt = 256; 231 const int bytecnt = 256;
232 232
233 printk(KERN_INFO 233 printk(KERN_INFO
234 "NETjet-S: %s card configured at %#lx IRQ %d\n", 234 "NETjet-S: %s card configured at %#lx IRQ %d\n",
235 cs->subtyp ? "TJ320" : "TJ300", cs->hw.njet.base, cs->irq); 235 cs->subtyp ? "TJ320" : "TJ300", cs->hw.njet.base, cs->irq);
236 if (!request_region(cs->hw.njet.base, bytecnt, "netjet-s isdn")) { 236 if (!request_region(cs->hw.njet.base, bytecnt, "netjet-s isdn")) {
237 printk(KERN_WARNING 237 printk(KERN_WARNING
238 "HiSax: NETjet-S config port %#lx-%#lx already in use\n", 238 "HiSax: NETjet-S config port %#lx-%#lx already in use\n",
@@ -271,24 +271,24 @@ setup_netjet_s(struct IsdnCard *card)
271 strcpy(tmp, NETjet_S_revision); 271 strcpy(tmp, NETjet_S_revision);
272 printk(KERN_INFO "HiSax: Traverse Tech. NETjet-S driver Rev. %s\n", HiSax_getrev(tmp)); 272 printk(KERN_INFO "HiSax: Traverse Tech. NETjet-S driver Rev. %s\n", HiSax_getrev(tmp));
273 if (cs->typ != ISDN_CTYPE_NETJET_S) 273 if (cs->typ != ISDN_CTYPE_NETJET_S)
274 return(0); 274 return (0);
275 test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); 275 test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags);
276 276
277 for ( ;; ) 277 for (;;)
278 { 278 {
279 if ((dev_netjet = hisax_find_pci_device(PCI_VENDOR_ID_TIGERJET, 279 if ((dev_netjet = hisax_find_pci_device(PCI_VENDOR_ID_TIGERJET,
280 PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { 280 PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) {
281 ret = njs_pci_probe(dev_netjet, cs); 281 ret = njs_pci_probe(dev_netjet, cs);
282 if (!ret) 282 if (!ret)
283 return(0); 283 return (0);
284 } else { 284 } else {
285 printk(KERN_WARNING "NETjet-S: No PCI card found\n"); 285 printk(KERN_WARNING "NETjet-S: No PCI card found\n");
286 return(0); 286 return (0);
287 } 287 }
288 288
289 ret = njs_cs_init(card, cs); 289 ret = njs_cs_init(card, cs);
290 if (!ret) 290 if (!ret)
291 return(0); 291 return (0);
292 if (ret > 0) 292 if (ret > 0)
293 break; 293 break;
294 /* otherwise, ret < 0, continue looping */ 294 /* otherwise, ret < 0, continue looping */