diff options
author | Manuel Zerpies <manuel.f.zerpies@ww.stud.uni-erlangen.de> | 2011-06-16 08:07:22 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-01 18:35:45 -0400 |
commit | 5a3c6b251d587715f8b87a50216e4c085c655777 (patch) | |
tree | fa1d3379b02b0bb243c367d30f84321dd1dc486d /drivers/tty/tty_io.c | |
parent | 6ab8fba7fcb012a42d686abd33555b2215071415 (diff) |
drivers/tty: use printk_ratelimited() instead of printk_ratelimit()
Since the printk_ratelimit() shouldn't be used anymore (see comment in
include/linux/printk.h), replace it with printk_ratelimited().
Signed-off-by: Manuel Zerpies <manuel.f.zerpies@ww.stud.uni-erlangen.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty/tty_io.c')
-rw-r--r-- | drivers/tty/tty_io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 6556f7452ba6..150e4f747c7d 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c | |||
@@ -94,6 +94,7 @@ | |||
94 | #include <linux/delay.h> | 94 | #include <linux/delay.h> |
95 | #include <linux/seq_file.h> | 95 | #include <linux/seq_file.h> |
96 | #include <linux/serial.h> | 96 | #include <linux/serial.h> |
97 | #include <linux/ratelimit.h> | ||
97 | 98 | ||
98 | #include <linux/uaccess.h> | 99 | #include <linux/uaccess.h> |
99 | #include <asm/system.h> | 100 | #include <asm/system.h> |
@@ -1420,8 +1421,7 @@ err_module_put: | |||
1420 | 1421 | ||
1421 | /* call the tty release_tty routine to clean out this slot */ | 1422 | /* call the tty release_tty routine to clean out this slot */ |
1422 | err_release_tty: | 1423 | err_release_tty: |
1423 | if (printk_ratelimit()) | 1424 | printk_ratelimited(KERN_INFO "tty_init_dev: ldisc open failed, " |
1424 | printk(KERN_INFO "tty_init_dev: ldisc open failed, " | ||
1425 | "clearing slot %d\n", idx); | 1425 | "clearing slot %d\n", idx); |
1426 | release_tty(tty, idx); | 1426 | release_tty(tty, idx); |
1427 | return ERR_PTR(retval); | 1427 | return ERR_PTR(retval); |