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/nj_u.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/nj_u.c')
-rw-r--r-- | drivers/isdn/hisax/nj_u.c | 100 |
1 files changed, 50 insertions, 50 deletions
diff --git a/drivers/isdn/hisax/nj_u.c b/drivers/isdn/hisax/nj_u.c index 095e974aed80..333484aef425 100644 --- a/drivers/isdn/hisax/nj_u.c +++ b/drivers/isdn/hisax/nj_u.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: nj_u.c,v 2.14.2.3 2004/01/13 14:31:26 keil Exp $ | 1 | /* $Id: nj_u.c,v 2.14.2.3 2004/01/13 14:31:26 keil Exp $ |
2 | * | 2 | * |
3 | * This software may be used and distributed according to the terms | 3 | * This software may be used and distributed according to the terms |
4 | * of the GNU General Public License, incorporated herein by reference. | 4 | * of the GNU General Public License, incorporated herein by reference. |
@@ -18,7 +18,7 @@ static const char *NETjet_U_revision = "$Revision: 2.14.2.3 $"; | |||
18 | 18 | ||
19 | static u_char dummyrr(struct IsdnCardState *cs, int chan, u_char off) | 19 | static u_char dummyrr(struct IsdnCardState *cs, int chan, u_char off) |
20 | { | 20 | { |
21 | return(5); | 21 | return (5); |
22 | } | 22 | } |
23 | 23 | ||
24 | static void dummywr(struct IsdnCardState *cs, int chan, u_char off, u_char value) | 24 | static void dummywr(struct IsdnCardState *cs, int chan, u_char off, u_char value) |
@@ -34,7 +34,7 @@ netjet_u_interrupt(int intno, void *dev_id) | |||
34 | 34 | ||
35 | spin_lock_irqsave(&cs->lock, flags); | 35 | spin_lock_irqsave(&cs->lock, flags); |
36 | if (!((sval = bytein(cs->hw.njet.base + NETJET_IRQSTAT1)) & | 36 | if (!((sval = bytein(cs->hw.njet.base + NETJET_IRQSTAT1)) & |
37 | NETJET_ISACIRQ)) { | 37 | NETJET_ISACIRQ)) { |
38 | val = NETjet_ReadIC(cs, ICC_ISTA); | 38 | val = NETjet_ReadIC(cs, ICC_ISTA); |
39 | if (cs->debug & L1_DEB_ISAC) | 39 | if (cs->debug & L1_DEB_ISAC) |
40 | debugl1(cs, "tiger: i1 %x %x", sval, val); | 40 | debugl1(cs, "tiger: i1 %x %x", sval, val); |
@@ -47,17 +47,17 @@ netjet_u_interrupt(int intno, void *dev_id) | |||
47 | /* start new code 13/07/00 GE */ | 47 | /* start new code 13/07/00 GE */ |
48 | /* set bits in sval to indicate which page is free */ | 48 | /* set bits in sval to indicate which page is free */ |
49 | if (inl(cs->hw.njet.base + NETJET_DMA_WRITE_ADR) < | 49 | if (inl(cs->hw.njet.base + NETJET_DMA_WRITE_ADR) < |
50 | inl(cs->hw.njet.base + NETJET_DMA_WRITE_IRQ)) | 50 | inl(cs->hw.njet.base + NETJET_DMA_WRITE_IRQ)) |
51 | /* the 2nd write page is free */ | 51 | /* the 2nd write page is free */ |
52 | sval = 0x08; | 52 | sval = 0x08; |
53 | else /* the 1st write page is free */ | 53 | else /* the 1st write page is free */ |
54 | sval = 0x04; | 54 | sval = 0x04; |
55 | if (inl(cs->hw.njet.base + NETJET_DMA_READ_ADR) < | 55 | if (inl(cs->hw.njet.base + NETJET_DMA_READ_ADR) < |
56 | inl(cs->hw.njet.base + NETJET_DMA_READ_IRQ)) | 56 | inl(cs->hw.njet.base + NETJET_DMA_READ_IRQ)) |
57 | /* the 2nd read page is free */ | 57 | /* the 2nd read page is free */ |
58 | sval = sval | 0x02; | 58 | sval = sval | 0x02; |
59 | else /* the 1st read page is free */ | 59 | else /* the 1st read page is free */ |
60 | sval = sval | 0x01; | 60 | sval = sval | 0x01; |
61 | if (sval != cs->hw.njet.last_is0) /* we have a DMA interrupt */ | 61 | if (sval != cs->hw.njet.last_is0) /* we have a DMA interrupt */ |
62 | { | 62 | { |
63 | if (test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { | 63 | if (test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) { |
@@ -65,12 +65,12 @@ netjet_u_interrupt(int intno, void *dev_id) | |||
65 | return IRQ_HANDLED; | 65 | return IRQ_HANDLED; |
66 | } | 66 | } |
67 | cs->hw.njet.irqstat0 = sval; | 67 | cs->hw.njet.irqstat0 = sval; |
68 | if ((cs->hw.njet.irqstat0 & NETJET_IRQM0_READ) != | 68 | if ((cs->hw.njet.irqstat0 & NETJET_IRQM0_READ) != |
69 | (cs->hw.njet.last_is0 & NETJET_IRQM0_READ)) | 69 | (cs->hw.njet.last_is0 & NETJET_IRQM0_READ)) |
70 | /* we have a read dma int */ | 70 | /* we have a read dma int */ |
71 | read_tiger(cs); | 71 | read_tiger(cs); |
72 | if ((cs->hw.njet.irqstat0 & NETJET_IRQM0_WRITE) != | 72 | if ((cs->hw.njet.irqstat0 & NETJET_IRQM0_WRITE) != |
73 | (cs->hw.njet.last_is0 & NETJET_IRQM0_WRITE)) | 73 | (cs->hw.njet.last_is0 & NETJET_IRQM0_WRITE)) |
74 | /* we have a write dma int */ | 74 | /* we have a write dma int */ |
75 | write_tiger(cs); | 75 | write_tiger(cs); |
76 | /* end new code 13/07/00 GE */ | 76 | /* end new code 13/07/00 GE */ |
@@ -104,45 +104,45 @@ NETjet_U_card_msg(struct IsdnCardState *cs, int mt, void *arg) | |||
104 | u_long flags; | 104 | u_long flags; |
105 | 105 | ||
106 | switch (mt) { | 106 | switch (mt) { |
107 | case CARD_RESET: | 107 | case CARD_RESET: |
108 | spin_lock_irqsave(&cs->lock, flags); | 108 | spin_lock_irqsave(&cs->lock, flags); |
109 | reset_netjet_u(cs); | 109 | reset_netjet_u(cs); |
110 | spin_unlock_irqrestore(&cs->lock, flags); | 110 | spin_unlock_irqrestore(&cs->lock, flags); |
111 | return(0); | 111 | return (0); |
112 | case CARD_RELEASE: | 112 | case CARD_RELEASE: |
113 | release_io_netjet(cs); | 113 | release_io_netjet(cs); |
114 | return(0); | 114 | return (0); |
115 | case CARD_INIT: | 115 | case CARD_INIT: |
116 | spin_lock_irqsave(&cs->lock, flags); | 116 | spin_lock_irqsave(&cs->lock, flags); |
117 | inittiger(cs); | 117 | inittiger(cs); |
118 | reset_netjet_u(cs); | 118 | reset_netjet_u(cs); |
119 | clear_pending_icc_ints(cs); | 119 | clear_pending_icc_ints(cs); |
120 | initicc(cs); | 120 | initicc(cs); |
121 | /* Reenable all IRQ */ | 121 | /* Reenable all IRQ */ |
122 | cs->writeisac(cs, ICC_MASK, 0); | 122 | cs->writeisac(cs, ICC_MASK, 0); |
123 | spin_unlock_irqrestore(&cs->lock, flags); | 123 | spin_unlock_irqrestore(&cs->lock, flags); |
124 | return(0); | 124 | return (0); |
125 | case CARD_TEST: | 125 | case CARD_TEST: |
126 | return(0); | 126 | return (0); |
127 | } | 127 | } |
128 | return(0); | 128 | return (0); |
129 | } | 129 | } |
130 | 130 | ||
131 | static int __devinit nju_pci_probe(struct pci_dev *dev_netjet, | 131 | static int __devinit nju_pci_probe(struct pci_dev *dev_netjet, |
132 | struct IsdnCardState *cs) | 132 | struct IsdnCardState *cs) |
133 | { | 133 | { |
134 | if (pci_enable_device(dev_netjet)) | 134 | if (pci_enable_device(dev_netjet)) |
135 | return(0); | 135 | return (0); |
136 | pci_set_master(dev_netjet); | 136 | pci_set_master(dev_netjet); |
137 | cs->irq = dev_netjet->irq; | 137 | cs->irq = dev_netjet->irq; |
138 | if (!cs->irq) { | 138 | if (!cs->irq) { |
139 | printk(KERN_WARNING "NETspider-U: No IRQ for PCI card found\n"); | 139 | printk(KERN_WARNING "NETspider-U: No IRQ for PCI card found\n"); |
140 | return(0); | 140 | return (0); |
141 | } | 141 | } |
142 | cs->hw.njet.base = pci_resource_start(dev_netjet, 0); | 142 | cs->hw.njet.base = pci_resource_start(dev_netjet, 0); |
143 | if (!cs->hw.njet.base) { | 143 | if (!cs->hw.njet.base) { |
144 | printk(KERN_WARNING "NETspider-U: No IO-Adr for PCI card found\n"); | 144 | printk(KERN_WARNING "NETspider-U: No IO-Adr for PCI card found\n"); |
145 | return(0); | 145 | return (0); |
146 | } | 146 | } |
147 | 147 | ||
148 | return (1); | 148 | return (1); |
@@ -171,18 +171,18 @@ static int __devinit nju_cs_init(struct IsdnCard *card, | |||
171 | byteout(cs->hw.njet.base + NETJET_IRQMASK1, NETJET_ISACIRQ); | 171 | byteout(cs->hw.njet.base + NETJET_IRQMASK1, NETJET_ISACIRQ); |
172 | byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); | 172 | byteout(cs->hw.njet.auxa, cs->hw.njet.auxd); |
173 | 173 | ||
174 | switch ( ( ( NETjet_ReadIC( cs, ICC_RBCH ) >> 5 ) & 3 ) ) | 174 | switch (((NETjet_ReadIC(cs, ICC_RBCH) >> 5) & 3)) |
175 | { | 175 | { |
176 | case 3 : | 176 | case 3: |
177 | return 1; /* end loop */ | 177 | return 1; /* end loop */ |
178 | 178 | ||
179 | case 0 : | 179 | case 0: |
180 | printk( KERN_WARNING "NETspider-U: NETjet-S PCI card found\n" ); | 180 | printk(KERN_WARNING "NETspider-U: NETjet-S PCI card found\n"); |
181 | return -1; /* continue looping */ | 181 | return -1; /* continue looping */ |
182 | 182 | ||
183 | default : | 183 | default: |
184 | printk( KERN_WARNING "NETspider-U: No PCI card found\n" ); | 184 | printk(KERN_WARNING "NETspider-U: No PCI card found\n"); |
185 | return 0; /* end loop & function */ | 185 | return 0; /* end loop & function */ |
186 | } | 186 | } |
187 | return 1; /* end loop */ | 187 | return 1; /* end loop */ |
188 | } | 188 | } |
@@ -193,8 +193,8 @@ static int __devinit nju_cs_init_rest(struct IsdnCard *card, | |||
193 | const int bytecnt = 256; | 193 | const int bytecnt = 256; |
194 | 194 | ||
195 | printk(KERN_INFO | 195 | printk(KERN_INFO |
196 | "NETspider-U: PCI card configured at %#lx IRQ %d\n", | 196 | "NETspider-U: PCI card configured at %#lx IRQ %d\n", |
197 | cs->hw.njet.base, cs->irq); | 197 | cs->hw.njet.base, cs->irq); |
198 | if (!request_region(cs->hw.njet.base, bytecnt, "netspider-u isdn")) { | 198 | if (!request_region(cs->hw.njet.base, bytecnt, "netspider-u isdn")) { |
199 | printk(KERN_WARNING | 199 | printk(KERN_WARNING |
200 | "HiSax: NETspider-U config port %#lx-%#lx " | 200 | "HiSax: NETspider-U config port %#lx-%#lx " |
@@ -235,19 +235,19 @@ setup_netjet_u(struct IsdnCard *card) | |||
235 | strcpy(tmp, NETjet_U_revision); | 235 | strcpy(tmp, NETjet_U_revision); |
236 | printk(KERN_INFO "HiSax: Traverse Tech. NETspider-U driver Rev. %s\n", HiSax_getrev(tmp)); | 236 | printk(KERN_INFO "HiSax: Traverse Tech. NETspider-U driver Rev. %s\n", HiSax_getrev(tmp)); |
237 | if (cs->typ != ISDN_CTYPE_NETJET_U) | 237 | if (cs->typ != ISDN_CTYPE_NETJET_U) |
238 | return(0); | 238 | return (0); |
239 | test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); | 239 | test_and_clear_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags); |
240 | 240 | ||
241 | for ( ;; ) | 241 | for (;;) |
242 | { | 242 | { |
243 | if ((dev_netjet = hisax_find_pci_device(PCI_VENDOR_ID_TIGERJET, | 243 | if ((dev_netjet = hisax_find_pci_device(PCI_VENDOR_ID_TIGERJET, |
244 | PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { | 244 | PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { |
245 | ret = nju_pci_probe(dev_netjet, cs); | 245 | ret = nju_pci_probe(dev_netjet, cs); |
246 | if (!ret) | 246 | if (!ret) |
247 | return(0); | 247 | return (0); |
248 | } else { | 248 | } else { |
249 | printk(KERN_WARNING "NETspider-U: No PCI card found\n"); | 249 | printk(KERN_WARNING "NETspider-U: No PCI card found\n"); |
250 | return(0); | 250 | return (0); |
251 | } | 251 | } |
252 | 252 | ||
253 | ret = nju_cs_init(card, cs); | 253 | ret = nju_cs_init(card, cs); |