Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Staging: cxt1e1: Fix no spaces at the start of a line in functions.c

This patch fixes the following checkpatch.pl warning in functions.c
WARNING: please no spaces at the start of a line in

Signed-off-by: Monam Agarwal <monamagarwal123@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Monam Agarwal and committed by
Greg Kroah-Hartman
bc4d6daf 223eaa37

+154 -160
+154 -160
drivers/staging/cxt1e1/functions.c
··· 25 25 #include "pmcc4.h" 26 26 27 27 #if defined(CONFIG_SBE_HDLC_V7) || defined(CONFIG_SBE_WAN256T3_HDLC_V7) || \ 28 - defined(CONFIG_SBE_HDLC_V7_MODULE) || defined(CONFIG_SBE_WAN256T3_HDLC_V7_MODULE) 28 + defined(CONFIG_SBE_HDLC_V7_MODULE) || defined(CONFIG_SBE_WAN256T3_HDLC_V7_MODULE) 29 29 #define _v7_hdlc_ 1 30 30 #else 31 31 #define _v7_hdlc_ 0 ··· 56 56 pci_read_32 (u_int32_t *p) 57 57 { 58 58 #ifdef FLOW_DEBUG 59 - u_int32_t v; 59 + u_int32_t v; 60 60 61 - FLUSH_PCI_READ (); 62 - v = le32_to_cpu (*p); 63 - if (cxt1e1_log_level >= LOG_DEBUG) 64 - pr_info("pci_read : %x = %x\n", (u_int32_t) p, v); 65 - return v; 61 + FLUSH_PCI_READ (); 62 + v = le32_to_cpu (*p); 63 + if (cxt1e1_log_level >= LOG_DEBUG) 64 + pr_info("pci_read : %x = %x\n", (u_int32_t) p, v); 65 + return v; 66 66 #else 67 - FLUSH_PCI_READ (); /* */ 68 - return le32_to_cpu (*p); 67 + FLUSH_PCI_READ (); /* */ 68 + return le32_to_cpu (*p); 69 69 #endif 70 70 } 71 71 ··· 73 73 pci_write_32 (u_int32_t *p, u_int32_t v) 74 74 { 75 75 #ifdef FLOW_DEBUG 76 - if (cxt1e1_log_level >= LOG_DEBUG) 77 - pr_info("pci_write: %x = %x\n", (u_int32_t) p, v); 76 + if (cxt1e1_log_level >= LOG_DEBUG) 77 + pr_info("pci_write: %x = %x\n", (u_int32_t) p, v); 78 78 #endif 79 - *p = cpu_to_le32 (v); 80 - FLUSH_PCI_WRITE (); /* This routine is called from routines 81 - * which do multiple register writes 82 - * which themselves need flushing between 83 - * writes in order to guarantee write 84 - * ordering. It is less code-cumbersome 85 - * to flush here-in then to investigate 86 - * and code the many other register 87 - * writing routines. */ 79 + *p = cpu_to_le32 (v); 80 + FLUSH_PCI_WRITE (); /* This routine is called from routines 81 + * which do multiple register writes 82 + * which themselves need flushing between 83 + * writes in order to guarantee write 84 + * ordering. It is less code-cumbersome 85 + * to flush here-in then to investigate 86 + * and code the many other register 87 + * writing routines. */ 88 88 } 89 89 #endif 90 90 ··· 92 92 void 93 93 pci_flush_write (ci_t *ci) 94 94 { 95 - volatile u_int32_t v; 95 + volatile u_int32_t v; 96 96 97 97 /* issue a PCI read to flush PCI write thru bridge */ 98 - v = *(u_int32_t *) &ci->reg->glcd; /* any address would do */ 98 + v = *(u_int32_t *) &ci->reg->glcd; /* any address would do */ 99 99 100 100 /* 101 101 * return nothing, this just reads PCI bridge interface to flush ··· 107 107 static void 108 108 watchdog_func (unsigned long arg) 109 109 { 110 - struct watchdog *wd = (void *) arg; 110 + struct watchdog *wd = (void *) arg; 111 111 112 - if (drvr_state != SBE_DRVR_AVAILABLE) 113 - { 114 - if (cxt1e1_log_level >= LOG_MONITOR) 115 - pr_warning("%s: drvr not available (%x)\n", __func__, drvr_state); 116 - return; 117 - } 118 - schedule_work (&wd->work); 119 - mod_timer (&wd->h, jiffies + wd->ticks); 112 + if (drvr_state != SBE_DRVR_AVAILABLE) { 113 + if (cxt1e1_log_level >= LOG_MONITOR) 114 + pr_warning("%s: drvr not available (%x)\n", __func__, drvr_state); 115 + return; 116 + } 117 + schedule_work (&wd->work); 118 + mod_timer (&wd->h, jiffies + wd->ticks); 120 119 } 121 120 122 121 int OS_init_watchdog(struct watchdog *wdp, void (*f) (void *), void *c, int usec) 123 122 { 124 - wdp->func = f; 125 - wdp->softc = c; 126 - wdp->ticks = (HZ) * (usec / 1000) / 1000; 127 - INIT_WORK(&wdp->work, (void *)f); 128 - init_timer (&wdp->h); 129 - { 130 - ci_t *ci = (ci_t *) c; 123 + wdp->func = f; 124 + wdp->softc = c; 125 + wdp->ticks = (HZ) * (usec / 1000) / 1000; 126 + INIT_WORK(&wdp->work, (void *)f); 127 + init_timer (&wdp->h); 128 + { 129 + ci_t *ci = (ci_t *) c; 131 130 132 - wdp->h.data = (unsigned long) &ci->wd; 133 - } 134 - wdp->h.function = watchdog_func; 135 - return 0; 131 + wdp->h.data = (unsigned long) &ci->wd; 132 + } 133 + wdp->h.function = watchdog_func; 134 + return 0; 136 135 } 137 136 138 137 void 139 138 OS_uwait (int usec, char *description) 140 139 { 141 - int tmp; 140 + int tmp; 142 141 143 - if (usec >= 1000) 144 - { 145 - mdelay (usec / 1000); 146 - /* now delay residual */ 147 - tmp = (usec / 1000) * 1000; /* round */ 148 - tmp = usec - tmp; /* residual */ 149 - if (tmp) 150 - { /* wait on residual */ 151 - udelay (tmp); 152 - } 153 - } else 154 - { 155 - udelay (usec); 156 - } 142 + if (usec >= 1000) { 143 + mdelay (usec / 1000); 144 + /* now delay residual */ 145 + tmp = (usec / 1000) * 1000; /* round */ 146 + tmp = usec - tmp; /* residual */ 147 + if (tmp) { /* wait on residual */ 148 + udelay (tmp); 149 + } 150 + } else { 151 + udelay (usec); 152 + } 157 153 } 158 154 159 155 /* dummy short delay routine called as a subroutine so that compiler ··· 160 164 OS_uwait_dummy (void) 161 165 { 162 166 #ifndef USE_MAX_INT_DELAY 163 - dummy++; 167 + dummy++; 164 168 #else 165 - udelay (1); 169 + udelay (1); 166 170 #endif 167 171 } 168 172 ··· 170 174 void 171 175 OS_sem_init (void *sem, int state) 172 176 { 173 - switch (state) 174 - { 175 - case SEM_TAKEN: 176 - sema_init((struct semaphore *) sem, 0); 177 - break; 178 - case SEM_AVAILABLE: 177 + switch (state) { 178 + case SEM_TAKEN: 179 + sema_init((struct semaphore *) sem, 0); 180 + break; 181 + case SEM_AVAILABLE: 179 182 sema_init((struct semaphore *) sem, 1); 180 - break; 181 - default: /* otherwise, set sem.count to state's 182 - * value */ 183 - sema_init (sem, state); 184 - break; 185 - } 183 + break; 184 + default: /* otherwise, set sem.count to state's 185 + * value */ 186 + sema_init (sem, state); 187 + break; 188 + } 186 189 } 187 190 188 191 189 192 int 190 193 sd_line_is_ok (void *user) 191 194 { 192 - struct net_device *ndev = (struct net_device *) user; 195 + struct net_device *ndev = (struct net_device *) user; 193 196 194 - return netif_carrier_ok (ndev); 197 + return netif_carrier_ok (ndev); 195 198 } 196 199 197 200 void 198 201 sd_line_is_up (void *user) 199 202 { 200 - struct net_device *ndev = (struct net_device *) user; 203 + struct net_device *ndev = (struct net_device *) user; 201 204 202 - netif_carrier_on (ndev); 203 - return; 205 + netif_carrier_on (ndev); 206 + return; 204 207 } 205 208 206 209 void 207 210 sd_line_is_down (void *user) 208 211 { 209 - struct net_device *ndev = (struct net_device *) user; 212 + struct net_device *ndev = (struct net_device *) user; 210 213 211 - netif_carrier_off (ndev); 212 - return; 214 + netif_carrier_off (ndev); 215 + return; 213 216 } 214 217 215 218 void 216 219 sd_disable_xmit (void *user) 217 220 { 218 - struct net_device *dev = (struct net_device *) user; 221 + struct net_device *dev = (struct net_device *) user; 219 222 220 - netif_stop_queue (dev); 221 - return; 223 + netif_stop_queue (dev); 224 + return; 222 225 } 223 226 224 227 void 225 228 sd_enable_xmit (void *user) 226 229 { 227 - struct net_device *dev = (struct net_device *) user; 230 + struct net_device *dev = (struct net_device *) user; 228 231 229 - netif_wake_queue (dev); 230 - return; 232 + netif_wake_queue (dev); 233 + return; 231 234 } 232 235 233 236 int 234 237 sd_queue_stopped (void *user) 235 238 { 236 - struct net_device *ndev = (struct net_device *) user; 239 + struct net_device *ndev = (struct net_device *) user; 237 240 238 - return netif_queue_stopped (ndev); 241 + return netif_queue_stopped (ndev); 239 242 } 240 243 241 244 void sd_recv_consume(void *token, size_t len, void *user) 242 245 { 243 - struct net_device *ndev = user; 244 - struct sk_buff *skb = token; 246 + struct net_device *ndev = user; 247 + struct sk_buff *skb = token; 245 248 246 - skb->dev = ndev; 247 - skb_put (skb, len); 248 - skb->protocol = hdlc_type_trans(skb, ndev); 249 - netif_rx(skb); 249 + skb->dev = ndev; 250 + skb_put (skb, len); 251 + skb->protocol = hdlc_type_trans(skb, ndev); 252 + netif_rx(skb); 250 253 } 251 254 252 255 ··· 260 265 void 261 266 VMETRO_TRIGGER (ci_t *ci, int x) 262 267 { 263 - struct s_comet_reg *comet; 264 - volatile u_int32_t data; 268 + struct s_comet_reg *comet; 269 + volatile u_int32_t data; 265 270 266 - comet = ci->port[0].cometbase; /* default to COMET # 0 */ 271 + comet = ci->port[0].cometbase; /* default to COMET # 0 */ 267 272 268 - switch (x) 269 - { 270 - default: 271 - case 0: 272 - data = pci_read_32 ((u_int32_t *) &comet->__res24); /* 0x90 */ 273 - break; 274 - case 1: 275 - data = pci_read_32 ((u_int32_t *) &comet->__res25); /* 0x94 */ 276 - break; 277 - case 2: 278 - data = pci_read_32 ((u_int32_t *) &comet->__res26); /* 0x98 */ 279 - break; 280 - case 3: 281 - data = pci_read_32 ((u_int32_t *) &comet->__res27); /* 0x9C */ 282 - break; 283 - case 4: 284 - data = pci_read_32 ((u_int32_t *) &comet->__res88); /* 0x220 */ 285 - break; 286 - case 5: 287 - data = pci_read_32 ((u_int32_t *) &comet->__res89); /* 0x224 */ 288 - break; 289 - case 6: 290 - data = pci_read_32 ((u_int32_t *) &comet->__res8A); /* 0x228 */ 291 - break; 292 - case 7: 293 - data = pci_read_32 ((u_int32_t *) &comet->__res8B); /* 0x22C */ 294 - break; 295 - case 8: 296 - data = pci_read_32 ((u_int32_t *) &comet->__resA0); /* 0x280 */ 297 - break; 298 - case 9: 299 - data = pci_read_32 ((u_int32_t *) &comet->__resA1); /* 0x284 */ 300 - break; 301 - case 10: 302 - data = pci_read_32 ((u_int32_t *) &comet->__resA2); /* 0x288 */ 303 - break; 304 - case 11: 305 - data = pci_read_32 ((u_int32_t *) &comet->__resA3); /* 0x28C */ 306 - break; 307 - case 12: 308 - data = pci_read_32 ((u_int32_t *) &comet->__resA4); /* 0x290 */ 309 - break; 310 - case 13: 311 - data = pci_read_32 ((u_int32_t *) &comet->__resA5); /* 0x294 */ 312 - break; 313 - case 14: 314 - data = pci_read_32 ((u_int32_t *) &comet->__resA6); /* 0x298 */ 315 - break; 316 - case 15: 317 - data = pci_read_32 ((u_int32_t *) &comet->__resA7); /* 0x29C */ 318 - break; 319 - case 16: 320 - data = pci_read_32 ((u_int32_t *) &comet->__res74); /* 0x1D0 */ 321 - break; 322 - case 17: 323 - data = pci_read_32 ((u_int32_t *) &comet->__res75); /* 0x1D4 */ 324 - break; 325 - case 18: 326 - data = pci_read_32 ((u_int32_t *) &comet->__res76); /* 0x1D8 */ 327 - break; 328 - case 19: 329 - data = pci_read_32 ((u_int32_t *) &comet->__res77); /* 0x1DC */ 330 - break; 331 - } 273 + switch (x) { 274 + default: 275 + case 0: 276 + data = pci_read_32 ((u_int32_t *) &comet->__res24); /* 0x90 */ 277 + break; 278 + case 1: 279 + data = pci_read_32 ((u_int32_t *) &comet->__res25); /* 0x94 */ 280 + break; 281 + case 2: 282 + data = pci_read_32 ((u_int32_t *) &comet->__res26); /* 0x98 */ 283 + break; 284 + case 3: 285 + data = pci_read_32 ((u_int32_t *) &comet->__res27); /* 0x9C */ 286 + break; 287 + case 4: 288 + data = pci_read_32 ((u_int32_t *) &comet->__res88); /* 0x220 */ 289 + break; 290 + case 5: 291 + data = pci_read_32 ((u_int32_t *) &comet->__res89); /* 0x224 */ 292 + break; 293 + case 6: 294 + data = pci_read_32 ((u_int32_t *) &comet->__res8A); /* 0x228 */ 295 + break; 296 + case 7: 297 + data = pci_read_32 ((u_int32_t *) &comet->__res8B); /* 0x22C */ 298 + break; 299 + case 8: 300 + data = pci_read_32 ((u_int32_t *) &comet->__resA0); /* 0x280 */ 301 + break; 302 + case 9: 303 + data = pci_read_32 ((u_int32_t *) &comet->__resA1); /* 0x284 */ 304 + break; 305 + case 10: 306 + data = pci_read_32 ((u_int32_t *) &comet->__resA2); /* 0x288 */ 307 + break; 308 + case 11: 309 + data = pci_read_32 ((u_int32_t *) &comet->__resA3); /* 0x28C */ 310 + break; 311 + case 12: 312 + data = pci_read_32 ((u_int32_t *) &comet->__resA4); /* 0x290 */ 313 + break; 314 + case 13: 315 + data = pci_read_32 ((u_int32_t *) &comet->__resA5); /* 0x294 */ 316 + break; 317 + case 14: 318 + data = pci_read_32 ((u_int32_t *) &comet->__resA6); /* 0x298 */ 319 + break; 320 + case 15: 321 + data = pci_read_32 ((u_int32_t *) &comet->__resA7); /* 0x29C */ 322 + break; 323 + case 16: 324 + data = pci_read_32 ((u_int32_t *) &comet->__res74); /* 0x1D0 */ 325 + break; 326 + case 17: 327 + data = pci_read_32 ((u_int32_t *) &comet->__res75); /* 0x1D4 */ 328 + break; 329 + case 18: 330 + data = pci_read_32 ((u_int32_t *) &comet->__res76); /* 0x1D8 */ 331 + break; 332 + case 19: 333 + data = pci_read_32 ((u_int32_t *) &comet->__res77); /* 0x1DC */ 334 + break; 335 + } 332 336 } 333 337 334 338