diff options
author | Dan Carpenter <error27@gmail.com> | 2010-05-31 17:09:33 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-02 08:16:22 -0400 |
commit | c1f8fc57c046903b5e7c891f2922592d5f775af3 (patch) | |
tree | fed7e2ce4c750b324ab5d18cab76bae6a9c1470a /drivers | |
parent | 7c25492871a50f9f72f4d1350bdea53169024864 (diff) |
caif: add newlines after declarations in caif_serial.c
I added newlines after the declarations in caif_serial.c. This is
normal kernel style, although I can't see anywhere it's documented.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/caif/caif_serial.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c index f30a6a015144..3e706f00a0d3 100644 --- a/drivers/net/caif/caif_serial.c +++ b/drivers/net/caif/caif_serial.c | |||
@@ -174,6 +174,7 @@ static void ldisc_receive(struct tty_struct *tty, const u8 *data, | |||
174 | struct ser_device *ser; | 174 | struct ser_device *ser; |
175 | int ret; | 175 | int ret; |
176 | u8 *p; | 176 | u8 *p; |
177 | |||
177 | ser = tty->disc_data; | 178 | ser = tty->disc_data; |
178 | 179 | ||
179 | /* | 180 | /* |
@@ -221,6 +222,7 @@ static int handle_tx(struct ser_device *ser) | |||
221 | struct tty_struct *tty; | 222 | struct tty_struct *tty; |
222 | struct sk_buff *skb; | 223 | struct sk_buff *skb; |
223 | int tty_wr, len, room; | 224 | int tty_wr, len, room; |
225 | |||
224 | tty = ser->tty; | 226 | tty = ser->tty; |
225 | ser->tx_started = true; | 227 | ser->tx_started = true; |
226 | 228 | ||
@@ -281,6 +283,7 @@ error: | |||
281 | static int caif_xmit(struct sk_buff *skb, struct net_device *dev) | 283 | static int caif_xmit(struct sk_buff *skb, struct net_device *dev) |
282 | { | 284 | { |
283 | struct ser_device *ser; | 285 | struct ser_device *ser; |
286 | |||
284 | BUG_ON(dev == NULL); | 287 | BUG_ON(dev == NULL); |
285 | ser = netdev_priv(dev); | 288 | ser = netdev_priv(dev); |
286 | 289 | ||
@@ -299,6 +302,7 @@ static int caif_xmit(struct sk_buff *skb, struct net_device *dev) | |||
299 | static void ldisc_tx_wakeup(struct tty_struct *tty) | 302 | static void ldisc_tx_wakeup(struct tty_struct *tty) |
300 | { | 303 | { |
301 | struct ser_device *ser; | 304 | struct ser_device *ser; |
305 | |||
302 | ser = tty->disc_data; | 306 | ser = tty->disc_data; |
303 | BUG_ON(ser == NULL); | 307 | BUG_ON(ser == NULL); |
304 | BUG_ON(ser->tty != tty); | 308 | BUG_ON(ser->tty != tty); |
@@ -348,6 +352,7 @@ static void ldisc_close(struct tty_struct *tty) | |||
348 | struct ser_device *ser = tty->disc_data; | 352 | struct ser_device *ser = tty->disc_data; |
349 | /* Remove may be called inside or outside of rtnl_lock */ | 353 | /* Remove may be called inside or outside of rtnl_lock */ |
350 | int islocked = rtnl_is_locked(); | 354 | int islocked = rtnl_is_locked(); |
355 | |||
351 | if (!islocked) | 356 | if (!islocked) |
352 | rtnl_lock(); | 357 | rtnl_lock(); |
353 | /* device is freed automagically by net-sysfs */ | 358 | /* device is freed automagically by net-sysfs */ |
@@ -374,6 +379,7 @@ static struct tty_ldisc_ops caif_ldisc = { | |||
374 | static int register_ldisc(void) | 379 | static int register_ldisc(void) |
375 | { | 380 | { |
376 | int result; | 381 | int result; |
382 | |||
377 | result = tty_register_ldisc(N_CAIF, &caif_ldisc); | 383 | result = tty_register_ldisc(N_CAIF, &caif_ldisc); |
378 | if (result < 0) { | 384 | if (result < 0) { |
379 | pr_err("cannot register CAIF ldisc=%d err=%d\n", N_CAIF, | 385 | pr_err("cannot register CAIF ldisc=%d err=%d\n", N_CAIF, |
@@ -391,6 +397,7 @@ static const struct net_device_ops netdev_ops = { | |||
391 | static void caifdev_setup(struct net_device *dev) | 397 | static void caifdev_setup(struct net_device *dev) |
392 | { | 398 | { |
393 | struct ser_device *serdev = netdev_priv(dev); | 399 | struct ser_device *serdev = netdev_priv(dev); |
400 | |||
394 | dev->features = 0; | 401 | dev->features = 0; |
395 | dev->netdev_ops = &netdev_ops; | 402 | dev->netdev_ops = &netdev_ops; |
396 | dev->type = ARPHRD_CAIF; | 403 | dev->type = ARPHRD_CAIF; |
@@ -423,6 +430,7 @@ static int caif_net_close(struct net_device *dev) | |||
423 | static int __init caif_ser_init(void) | 430 | static int __init caif_ser_init(void) |
424 | { | 431 | { |
425 | int ret; | 432 | int ret; |
433 | |||
426 | ret = register_ldisc(); | 434 | ret = register_ldisc(); |
427 | debugfsdir = debugfs_create_dir("caif_serial", NULL); | 435 | debugfsdir = debugfs_create_dir("caif_serial", NULL); |
428 | return ret; | 436 | return ret; |
@@ -433,6 +441,7 @@ static void __exit caif_ser_exit(void) | |||
433 | struct ser_device *ser = NULL; | 441 | struct ser_device *ser = NULL; |
434 | struct list_head *node; | 442 | struct list_head *node; |
435 | struct list_head *_tmp; | 443 | struct list_head *_tmp; |
444 | |||
436 | list_for_each_safe(node, _tmp, &ser_list) { | 445 | list_for_each_safe(node, _tmp, &ser_list) { |
437 | ser = list_entry(node, struct ser_device, node); | 446 | ser = list_entry(node, struct ser_device, node); |
438 | dev_close(ser->dev); | 447 | dev_close(ser->dev); |