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/sc/timer.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/sc/timer.c')
-rw-r--r-- | drivers/isdn/sc/timer.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/drivers/isdn/sc/timer.c b/drivers/isdn/sc/timer.c index 91fbe0dc28ec..6fbac2230d7e 100644 --- a/drivers/isdn/sc/timer.c +++ b/drivers/isdn/sc/timer.c | |||
@@ -31,7 +31,7 @@ static void setup_ports(int card) | |||
31 | 31 | ||
32 | /* And the IRQ */ | 32 | /* And the IRQ */ |
33 | outb((sc_adapter[card]->interrupt | 0x80), | 33 | outb((sc_adapter[card]->interrupt | 0x80), |
34 | sc_adapter[card]->ioport[IRQ_SELECT]); | 34 | sc_adapter[card]->ioport[IRQ_SELECT]); |
35 | } | 35 | } |
36 | 36 | ||
37 | /* | 37 | /* |
@@ -50,18 +50,18 @@ void sc_check_reset(unsigned long data) | |||
50 | int card = (unsigned int) data; | 50 | int card = (unsigned int) data; |
51 | 51 | ||
52 | pr_debug("%s: check_timer timer called\n", | 52 | pr_debug("%s: check_timer timer called\n", |
53 | sc_adapter[card]->devicename); | 53 | sc_adapter[card]->devicename); |
54 | 54 | ||
55 | /* Setup the io ports */ | 55 | /* Setup the io ports */ |
56 | setup_ports(card); | 56 | setup_ports(card); |
57 | 57 | ||
58 | spin_lock_irqsave(&sc_adapter[card]->lock, flags); | 58 | spin_lock_irqsave(&sc_adapter[card]->lock, flags); |
59 | outb(sc_adapter[card]->ioport[sc_adapter[card]->shmem_pgport], | 59 | outb(sc_adapter[card]->ioport[sc_adapter[card]->shmem_pgport], |
60 | (sc_adapter[card]->shmem_magic>>14) | 0x80); | 60 | (sc_adapter[card]->shmem_magic >> 14) | 0x80); |
61 | sig = (unsigned long) *((unsigned long *)(sc_adapter[card]->rambase + SIG_OFFSET)); | 61 | sig = (unsigned long) *((unsigned long *)(sc_adapter[card]->rambase + SIG_OFFSET)); |
62 | 62 | ||
63 | /* check the signature */ | 63 | /* check the signature */ |
64 | if(sig == SIGNATURE) { | 64 | if (sig == SIGNATURE) { |
65 | flushreadfifo(card); | 65 | flushreadfifo(card); |
66 | spin_unlock_irqrestore(&sc_adapter[card]->lock, flags); | 66 | spin_unlock_irqrestore(&sc_adapter[card]->lock, flags); |
67 | /* See if we need to do a startproc */ | 67 | /* See if we need to do a startproc */ |
@@ -69,8 +69,8 @@ void sc_check_reset(unsigned long data) | |||
69 | startproc(card); | 69 | startproc(card); |
70 | } else { | 70 | } else { |
71 | pr_debug("%s: No signature yet, waiting another %lu jiffies.\n", | 71 | pr_debug("%s: No signature yet, waiting another %lu jiffies.\n", |
72 | sc_adapter[card]->devicename, CHECKRESET_TIME); | 72 | sc_adapter[card]->devicename, CHECKRESET_TIME); |
73 | mod_timer(&sc_adapter[card]->reset_timer, jiffies+CHECKRESET_TIME); | 73 | mod_timer(&sc_adapter[card]->reset_timer, jiffies + CHECKRESET_TIME); |
74 | spin_unlock_irqrestore(&sc_adapter[card]->lock, flags); | 74 | spin_unlock_irqrestore(&sc_adapter[card]->lock, flags); |
75 | } | 75 | } |
76 | } | 76 | } |
@@ -91,19 +91,19 @@ void check_phystat(unsigned long data) | |||
91 | int card = (unsigned int) data; | 91 | int card = (unsigned int) data; |
92 | 92 | ||
93 | pr_debug("%s: Checking status...\n", sc_adapter[card]->devicename); | 93 | pr_debug("%s: Checking status...\n", sc_adapter[card]->devicename); |
94 | /* | 94 | /* |
95 | * check the results of the last PhyStat and change only if | 95 | * check the results of the last PhyStat and change only if |
96 | * has changed drastically | 96 | * has changed drastically |
97 | */ | 97 | */ |
98 | if (sc_adapter[card]->nphystat && !sc_adapter[card]->phystat) { /* All is well */ | 98 | if (sc_adapter[card]->nphystat && !sc_adapter[card]->phystat) { /* All is well */ |
99 | pr_debug("PhyStat transition to RUN\n"); | 99 | pr_debug("PhyStat transition to RUN\n"); |
100 | pr_info("%s: Switch contacted, transmitter enabled\n", | 100 | pr_info("%s: Switch contacted, transmitter enabled\n", |
101 | sc_adapter[card]->devicename); | 101 | sc_adapter[card]->devicename); |
102 | indicate_status(card, ISDN_STAT_RUN, 0, NULL); | 102 | indicate_status(card, ISDN_STAT_RUN, 0, NULL); |
103 | } | 103 | } |
104 | else if (!sc_adapter[card]->nphystat && sc_adapter[card]->phystat) { /* All is not well */ | 104 | else if (!sc_adapter[card]->nphystat && sc_adapter[card]->phystat) { /* All is not well */ |
105 | pr_debug("PhyStat transition to STOP\n"); | 105 | pr_debug("PhyStat transition to STOP\n"); |
106 | pr_info("%s: Switch connection lost, transmitter disabled\n", | 106 | pr_info("%s: Switch connection lost, transmitter disabled\n", |
107 | sc_adapter[card]->devicename); | 107 | sc_adapter[card]->devicename); |
108 | 108 | ||
109 | indicate_status(card, ISDN_STAT_STOP, 0, NULL); | 109 | indicate_status(card, ISDN_STAT_STOP, 0, NULL); |
@@ -113,11 +113,10 @@ void check_phystat(unsigned long data) | |||
113 | 113 | ||
114 | /* Reinitialize the timer */ | 114 | /* Reinitialize the timer */ |
115 | spin_lock_irqsave(&sc_adapter[card]->lock, flags); | 115 | spin_lock_irqsave(&sc_adapter[card]->lock, flags); |
116 | mod_timer(&sc_adapter[card]->stat_timer, jiffies+CHECKSTAT_TIME); | 116 | mod_timer(&sc_adapter[card]->stat_timer, jiffies + CHECKSTAT_TIME); |
117 | spin_unlock_irqrestore(&sc_adapter[card]->lock, flags); | 117 | spin_unlock_irqrestore(&sc_adapter[card]->lock, flags); |
118 | 118 | ||
119 | /* Send a new cePhyStatus message */ | 119 | /* Send a new cePhyStatus message */ |
120 | sendmessage(card, CEPID,ceReqTypePhy,ceReqClass2, | 120 | sendmessage(card, CEPID, ceReqTypePhy, ceReqClass2, |
121 | ceReqPhyStatus,0,0,NULL); | 121 | ceReqPhyStatus, 0, 0, NULL); |
122 | } | 122 | } |
123 | |||