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>
This commit is contained in:
parent
6ab8fba7fc
commit
5a3c6b251d
|
@ -44,6 +44,7 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/ratelimit.h>
|
||||
|
||||
#include <asm/system.h>
|
||||
#include <asm/io.h>
|
||||
|
@ -242,8 +243,8 @@ static void moxa_wait_finish(void __iomem *ofsAddr)
|
|||
while (readw(ofsAddr + FuncCode) != 0)
|
||||
if (time_after(jiffies, end))
|
||||
return;
|
||||
if (readw(ofsAddr + FuncCode) != 0 && printk_ratelimit())
|
||||
printk(KERN_WARNING "moxa function expired\n");
|
||||
if (readw(ofsAddr + FuncCode) != 0)
|
||||
printk_ratelimited(KERN_WARNING "moxa function expired\n");
|
||||
}
|
||||
|
||||
static void moxafunc(void __iomem *ofsAddr, u16 cmd, u16 arg)
|
||||
|
|
|
@ -39,6 +39,7 @@
|
|||
#include <linux/pci.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/ratelimit.h>
|
||||
|
||||
#include <asm/system.h>
|
||||
#include <asm/io.h>
|
||||
|
@ -1490,8 +1491,7 @@ static int mxser_ioctl_special(unsigned int cmd, void __user *argp)
|
|||
|
||||
switch (cmd) {
|
||||
case MOXA_GET_MAJOR:
|
||||
if (printk_ratelimit())
|
||||
printk(KERN_WARNING "mxser: '%s' uses deprecated ioctl "
|
||||
printk_ratelimited(KERN_WARNING "mxser: '%s' uses deprecated ioctl "
|
||||
"%x (GET_MAJOR), fix your userspace\n",
|
||||
current->comm, cmd);
|
||||
return put_user(ttymajor, (int __user *)argp);
|
||||
|
|
|
@ -94,6 +94,7 @@
|
|||
#include <linux/delay.h>
|
||||
#include <linux/seq_file.h>
|
||||
#include <linux/serial.h>
|
||||
#include <linux/ratelimit.h>
|
||||
|
||||
#include <linux/uaccess.h>
|
||||
#include <asm/system.h>
|
||||
|
@ -1420,8 +1421,7 @@ err_module_put:
|
|||
|
||||
/* call the tty release_tty routine to clean out this slot */
|
||||
err_release_tty:
|
||||
if (printk_ratelimit())
|
||||
printk(KERN_INFO "tty_init_dev: ldisc open failed, "
|
||||
printk_ratelimited(KERN_INFO "tty_init_dev: ldisc open failed, "
|
||||
"clearing slot %d\n", idx);
|
||||
release_tty(tty, idx);
|
||||
return ERR_PTR(retval);
|
||||
|
|
Loading…
Reference in a new issue