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/mISDN/clock.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/mISDN/clock.c')
-rw-r--r-- | drivers/isdn/mISDN/clock.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/drivers/isdn/mISDN/clock.c b/drivers/isdn/mISDN/clock.c index 7418f2d811d8..693fb7c9b59a 100644 --- a/drivers/isdn/mISDN/clock.c +++ b/drivers/isdn/mISDN/clock.c | |||
@@ -13,11 +13,11 @@ | |||
13 | * Quick API description: | 13 | * Quick API description: |
14 | * | 14 | * |
15 | * A clock source registers using mISDN_register_clock: | 15 | * A clock source registers using mISDN_register_clock: |
16 | * name = text string to name clock source | 16 | * name = text string to name clock source |
17 | * priority = value to priorize clock sources (0 = default) | 17 | * priority = value to priorize clock sources (0 = default) |
18 | * ctl = callback function to enable/disable clock source | 18 | * ctl = callback function to enable/disable clock source |
19 | * priv = private pointer of clock source | 19 | * priv = private pointer of clock source |
20 | * return = pointer to clock source structure; | 20 | * return = pointer to clock source structure; |
21 | * | 21 | * |
22 | * Note: Callback 'ctl' can be called before mISDN_register_clock returns! | 22 | * Note: Callback 'ctl' can be called before mISDN_register_clock returns! |
23 | * Also it can be called during mISDN_unregister_clock. | 23 | * Also it can be called during mISDN_unregister_clock. |
@@ -74,14 +74,14 @@ select_iclock(void) | |||
74 | /* last used clock source still exists but changes, disable */ | 74 | /* last used clock source still exists but changes, disable */ |
75 | if (*debug & DEBUG_CLOCK) | 75 | if (*debug & DEBUG_CLOCK) |
76 | printk(KERN_DEBUG "Old clock source '%s' disable.\n", | 76 | printk(KERN_DEBUG "Old clock source '%s' disable.\n", |
77 | lastclock->name); | 77 | lastclock->name); |
78 | lastclock->ctl(lastclock->priv, 0); | 78 | lastclock->ctl(lastclock->priv, 0); |
79 | } | 79 | } |
80 | if (bestclock && bestclock != iclock_current) { | 80 | if (bestclock && bestclock != iclock_current) { |
81 | /* new clock source selected, enable */ | 81 | /* new clock source selected, enable */ |
82 | if (*debug & DEBUG_CLOCK) | 82 | if (*debug & DEBUG_CLOCK) |
83 | printk(KERN_DEBUG "New clock source '%s' enable.\n", | 83 | printk(KERN_DEBUG "New clock source '%s' enable.\n", |
84 | bestclock->name); | 84 | bestclock->name); |
85 | bestclock->ctl(bestclock->priv, 1); | 85 | bestclock->ctl(bestclock->priv, 1); |
86 | } | 86 | } |
87 | if (bestclock != iclock_current) { | 87 | if (bestclock != iclock_current) { |
@@ -104,7 +104,7 @@ struct mISDNclock | |||
104 | printk(KERN_ERR "%s: No memory for clock entry.\n", __func__); | 104 | printk(KERN_ERR "%s: No memory for clock entry.\n", __func__); |
105 | return NULL; | 105 | return NULL; |
106 | } | 106 | } |
107 | strncpy(iclock->name, name, sizeof(iclock->name)-1); | 107 | strncpy(iclock->name, name, sizeof(iclock->name) - 1); |
108 | iclock->pri = pri; | 108 | iclock->pri = pri; |
109 | iclock->priv = priv; | 109 | iclock->priv = priv; |
110 | iclock->ctl = ctl; | 110 | iclock->ctl = ctl; |
@@ -123,13 +123,13 @@ mISDN_unregister_clock(struct mISDNclock *iclock) | |||
123 | 123 | ||
124 | if (*debug & (DEBUG_CORE | DEBUG_CLOCK)) | 124 | if (*debug & (DEBUG_CORE | DEBUG_CLOCK)) |
125 | printk(KERN_DEBUG "%s: %s %d\n", __func__, iclock->name, | 125 | printk(KERN_DEBUG "%s: %s %d\n", __func__, iclock->name, |
126 | iclock->pri); | 126 | iclock->pri); |
127 | write_lock_irqsave(&iclock_lock, flags); | 127 | write_lock_irqsave(&iclock_lock, flags); |
128 | if (iclock_current == iclock) { | 128 | if (iclock_current == iclock) { |
129 | if (*debug & DEBUG_CLOCK) | 129 | if (*debug & DEBUG_CLOCK) |
130 | printk(KERN_DEBUG | 130 | printk(KERN_DEBUG |
131 | "Current clock source '%s' unregisters.\n", | 131 | "Current clock source '%s' unregisters.\n", |
132 | iclock->name); | 132 | iclock->name); |
133 | iclock->ctl(iclock->priv, 0); | 133 | iclock->ctl(iclock->priv, 0); |
134 | } | 134 | } |
135 | list_del(&iclock->list); | 135 | list_del(&iclock->list); |
@@ -149,9 +149,9 @@ mISDN_clock_update(struct mISDNclock *iclock, int samples, struct timeval *tv) | |||
149 | write_lock_irqsave(&iclock_lock, flags); | 149 | write_lock_irqsave(&iclock_lock, flags); |
150 | if (iclock_current != iclock) { | 150 | if (iclock_current != iclock) { |
151 | printk(KERN_ERR "%s: '%s' sends us clock updates, but we do " | 151 | printk(KERN_ERR "%s: '%s' sends us clock updates, but we do " |
152 | "listen to '%s'. This is a bug!\n", __func__, | 152 | "listen to '%s'. This is a bug!\n", __func__, |
153 | iclock->name, | 153 | iclock->name, |
154 | iclock_current ? iclock_current->name : "nothing"); | 154 | iclock_current ? iclock_current->name : "nothing"); |
155 | iclock->ctl(iclock->priv, 0); | 155 | iclock->ctl(iclock->priv, 0); |
156 | write_unlock_irqrestore(&iclock_lock, flags); | 156 | write_unlock_irqrestore(&iclock_lock, flags); |
157 | return; | 157 | return; |
@@ -185,7 +185,7 @@ mISDN_clock_update(struct mISDNclock *iclock, int samples, struct timeval *tv) | |||
185 | iclock_tv_valid = 1; | 185 | iclock_tv_valid = 1; |
186 | if (*debug & DEBUG_CLOCK) | 186 | if (*debug & DEBUG_CLOCK) |
187 | printk("Received first clock from source '%s'.\n", | 187 | printk("Received first clock from source '%s'.\n", |
188 | iclock_current ? iclock_current->name : "nothing"); | 188 | iclock_current ? iclock_current->name : "nothing"); |
189 | } | 189 | } |
190 | write_unlock_irqrestore(&iclock_lock, flags); | 190 | write_unlock_irqrestore(&iclock_lock, flags); |
191 | } | 191 | } |
@@ -215,4 +215,3 @@ mISDN_clock_get(void) | |||
215 | return count; | 215 | return count; |
216 | } | 216 | } |
217 | EXPORT_SYMBOL(mISDN_clock_get); | 217 | EXPORT_SYMBOL(mISDN_clock_get); |
218 | |||