aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2011-03-23 19:42:57 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-23 22:46:39 -0400
commit115bcd156a7c4b4dad950f3bd2e4d023688c2ee7 (patch)
tree2124bc65ab61f8e72b4bfd959970ccc2b8a90949
parentd9d691f584bd012d235c35279c043a2ccd23d7d7 (diff)
drivers/staging/tty/specialix.c: convert func_enter to func_exit
Convert calls to func_enter on leaving a function to func_exit. The semantic patch that fixes this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ @@ - func_enter(); + func_exit(); return...; // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Cc: Roger Wolff <R.E.Wolff@BitWizard.nl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/staging/tty/specialix.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/tty/specialix.c b/drivers/staging/tty/specialix.c
index 47e5753f732a..17a1be536a46 100644
--- a/drivers/staging/tty/specialix.c
+++ b/drivers/staging/tty/specialix.c
@@ -1416,7 +1416,7 @@ static int sx_open(struct tty_struct *tty, struct file *filp)
1416 board, bp, port, SX_PORT(tty->index)); 1416 board, bp, port, SX_PORT(tty->index));
1417 1417
1418 if (sx_paranoia_check(port, tty->name, "sx_open")) { 1418 if (sx_paranoia_check(port, tty->name, "sx_open")) {
1419 func_enter(); 1419 func_exit();
1420 return -ENODEV; 1420 return -ENODEV;
1421 } 1421 }
1422 1422
@@ -1435,13 +1435,13 @@ static int sx_open(struct tty_struct *tty, struct file *filp)
1435 1435
1436 error = sx_setup_port(bp, port); 1436 error = sx_setup_port(bp, port);
1437 if (error) { 1437 if (error) {
1438 func_enter(); 1438 func_exit();
1439 return error; 1439 return error;
1440 } 1440 }
1441 1441
1442 error = block_til_ready(tty, filp, port); 1442 error = block_til_ready(tty, filp, port);
1443 if (error) { 1443 if (error) {
1444 func_enter(); 1444 func_exit();
1445 return error; 1445 return error;
1446 } 1446 }
1447 1447
@@ -1860,7 +1860,7 @@ static int sx_set_serial_info(struct specialix_port *port,
1860 func_enter(); 1860 func_enter();
1861 1861
1862 if (copy_from_user(&tmp, newinfo, sizeof(tmp))) { 1862 if (copy_from_user(&tmp, newinfo, sizeof(tmp))) {
1863 func_enter(); 1863 func_exit();
1864 return -EFAULT; 1864 return -EFAULT;
1865 } 1865 }
1866 1866