aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hysdn/boardergo.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/hysdn/boardergo.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/hysdn/boardergo.c')
-rw-r--r--drivers/isdn/hysdn/boardergo.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/isdn/hysdn/boardergo.c b/drivers/isdn/hysdn/boardergo.c
index 3eb096f0ae1b..2aa2a0e08247 100644
--- a/drivers/isdn/hysdn/boardergo.c
+++ b/drivers/isdn/hysdn/boardergo.c
@@ -25,7 +25,7 @@
25#include "hysdn_defs.h" 25#include "hysdn_defs.h"
26#include "boardergo.h" 26#include "boardergo.h"
27 27
28#define byteout(addr,val) outb(val,addr) 28#define byteout(addr, val) outb(val, addr)
29#define bytein(addr) inb(addr) 29#define bytein(addr) inb(addr)
30 30
31/***************************************************/ 31/***************************************************/
@@ -73,7 +73,7 @@ ergo_interrupt(int intno, void *dev_id)
73static void 73static void
74ergo_irq_bh(struct work_struct *ugli_api) 74ergo_irq_bh(struct work_struct *ugli_api)
75{ 75{
76 hysdn_card * card = container_of(ugli_api, hysdn_card, irq_queue); 76 hysdn_card *card = container_of(ugli_api, hysdn_card, irq_queue);
77 tErgDpram *dpr; 77 tErgDpram *dpr;
78 int again; 78 int again;
79 unsigned long flags; 79 unsigned long flags;
@@ -125,7 +125,7 @@ ergo_irq_bh(struct work_struct *ugli_api)
125/* stop the card (hardware reset) and disable interrupts */ 125/* stop the card (hardware reset) and disable interrupts */
126/*********************************************************/ 126/*********************************************************/
127static void 127static void
128ergo_stopcard(hysdn_card * card) 128ergo_stopcard(hysdn_card *card)
129{ 129{
130 unsigned long flags; 130 unsigned long flags;
131 unsigned char val; 131 unsigned char val;
@@ -150,7 +150,7 @@ ergo_stopcard(hysdn_card * card)
150/* enable or disable the cards error log. The event is queued if possible */ 150/* enable or disable the cards error log. The event is queued if possible */
151/**************************************************************************/ 151/**************************************************************************/
152static void 152static void
153ergo_set_errlog_state(hysdn_card * card, int on) 153ergo_set_errlog_state(hysdn_card *card, int on)
154{ 154{
155 unsigned long flags; 155 unsigned long flags;
156 156
@@ -180,7 +180,7 @@ ergo_set_errlog_state(hysdn_card * card, int on)
180static const char TestText[36] = "This Message is filler, why read it"; 180static const char TestText[36] = "This Message is filler, why read it";
181 181
182static int 182static int
183ergo_testram(hysdn_card * card) 183ergo_testram(hysdn_card *card)
184{ 184{
185 tErgDpram *dpr = card->dpram; 185 tErgDpram *dpr = card->dpram;
186 186
@@ -212,12 +212,12 @@ ergo_testram(hysdn_card * card)
212/*****************************************************************************/ 212/*****************************************************************************/
213static int 213static int
214ergo_writebootimg(struct HYSDN_CARD *card, unsigned char *buf, 214ergo_writebootimg(struct HYSDN_CARD *card, unsigned char *buf,
215 unsigned long offs) 215 unsigned long offs)
216{ 216{
217 unsigned char *dst; 217 unsigned char *dst;
218 tErgDpram *dpram; 218 tErgDpram *dpram;
219 int cnt = (BOOT_IMG_SIZE >> 2); /* number of words to move and swap (byte order!) */ 219 int cnt = (BOOT_IMG_SIZE >> 2); /* number of words to move and swap (byte order!) */
220 220
221 if (card->debug_flags & LOG_POF_CARD) 221 if (card->debug_flags & LOG_POF_CARD)
222 hysdn_addlog(card, "ERGO: write bootldr offs=0x%lx ", offs); 222 hysdn_addlog(card, "ERGO: write bootldr offs=0x%lx ", offs);
223 223
@@ -355,7 +355,7 @@ ergo_waitpofready(struct HYSDN_CARD *card)
355 /* enable the cards interrupt */ 355 /* enable the cards interrupt */
356 byteout(card->iobase + PCI9050_INTR_REG, 356 byteout(card->iobase + PCI9050_INTR_REG,
357 bytein(card->iobase + PCI9050_INTR_REG) | 357 bytein(card->iobase + PCI9050_INTR_REG) |
358 (PCI9050_INTR_REG_ENPCI | PCI9050_INTR_REG_EN1)); 358 (PCI9050_INTR_REG_ENPCI | PCI9050_INTR_REG_EN1));
359 card->irq_enabled = 1; /* we are ready to receive interrupts */ 359 card->irq_enabled = 1; /* we are ready to receive interrupts */
360 360
361 dpr->ToPcFlag = 0; /* reset data indicator */ 361 dpr->ToPcFlag = 0; /* reset data indicator */
@@ -363,15 +363,15 @@ ergo_waitpofready(struct HYSDN_CARD *card)
363 dpr->ToPcInt = 1; /* interrupt to E1 for all cards */ 363 dpr->ToPcInt = 1; /* interrupt to E1 for all cards */
364 364
365 spin_unlock_irqrestore(&card->hysdn_lock, flags); 365 spin_unlock_irqrestore(&card->hysdn_lock, flags);
366 if ((hynet_enable & (1 << card->myid)) 366 if ((hynet_enable & (1 << card->myid))
367 && (i = hysdn_net_create(card))) 367 && (i = hysdn_net_create(card)))
368 { 368 {
369 ergo_stopcard(card); 369 ergo_stopcard(card);
370 card->state = CARD_STATE_BOOTERR; 370 card->state = CARD_STATE_BOOTERR;
371 return (i); 371 return (i);
372 } 372 }
373#ifdef CONFIG_HYSDN_CAPI 373#ifdef CONFIG_HYSDN_CAPI
374 if((i = hycapi_capi_create(card))) { 374 if ((i = hycapi_capi_create(card))) {
375 printk(KERN_WARNING "HYSDN: failed to create capi-interface.\n"); 375 printk(KERN_WARNING "HYSDN: failed to create capi-interface.\n");
376 } 376 }
377#endif /* CONFIG_HYSDN_CAPI */ 377#endif /* CONFIG_HYSDN_CAPI */
@@ -393,7 +393,7 @@ ergo_waitpofready(struct HYSDN_CARD *card)
393/* Use only during module release. */ 393/* Use only during module release. */
394/************************************************************************************/ 394/************************************************************************************/
395static void 395static void
396ergo_releasehardware(hysdn_card * card) 396ergo_releasehardware(hysdn_card *card)
397{ 397{
398 ergo_stopcard(card); /* first stop the card if not already done */ 398 ergo_stopcard(card); /* first stop the card if not already done */
399 free_irq(card->irq, card); /* release interrupt */ 399 free_irq(card->irq, card); /* release interrupt */
@@ -410,9 +410,9 @@ ergo_releasehardware(hysdn_card * card)
410/* Use only during module init. */ 410/* Use only during module init. */
411/*********************************************************************************/ 411/*********************************************************************************/
412int 412int
413ergo_inithardware(hysdn_card * card) 413ergo_inithardware(hysdn_card *card)
414{ 414{
415 if (!request_region(card->iobase + PCI9050_INTR_REG, 1, "HYSDN")) 415 if (!request_region(card->iobase + PCI9050_INTR_REG, 1, "HYSDN"))
416 return (-1); 416 return (-1);
417 if (!request_region(card->iobase + PCI9050_USER_IO, 1, "HYSDN")) { 417 if (!request_region(card->iobase + PCI9050_USER_IO, 1, "HYSDN")) {
418 release_region(card->iobase + PCI9050_INTR_REG, 1); 418 release_region(card->iobase + PCI9050_INTR_REG, 1);