Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[firefly-linux-kernel-4.4.55.git] / net / irda / ircomm / ircomm_tty_ioctl.c

diff --git a/net/irda/ircomm/ircomm_tty_ioctl.c b/net/irda/ircomm/ircomm_tty_ioctl.c
index ce943853c38d6a913e6d5a113f1a71857537fb69..75ccdbd0728e18a9f4892504f2814e8e918b8097 100644 (file)
--- a/net/irda/ircomm/ircomm_tty_ioctl.c
+++ b/net/irda/ircomm/ircomm_tty_ioctl.c
@@ -56,8 +56,6 @@ static void ircomm_tty_change_speed(struct ircomm_tty_cb *self,
        unsigned int cflag, cval;
        int baud;
 
-       IRDA_DEBUG(2, "%s()\n", __func__ );
-
        if (!self->ircomm)
                return;
 
@@ -93,7 +91,8 @@ static void ircomm_tty_change_speed(struct ircomm_tty_cb *self,
                self->settings.flow_control |= IRCOMM_RTS_CTS_IN;
                /* This got me. Bummer. Jean II */
                if (self->service_type == IRCOMM_3_WIRE_RAW)
-                       IRDA_WARNING("%s(), enabling RTS/CTS on link that doesn't support it (3-wire-raw)\n", __func__);
+                       net_warn_ratelimited("%s(), enabling RTS/CTS on link that doesn't support it (3-wire-raw)\n",
+                                            __func__);
        } else {
                self->port.flags &= ~ASYNC_CTS_FLOW;
                self->settings.flow_control &= ~IRCOMM_RTS_CTS_IN;
@@ -149,8 +148,6 @@ void ircomm_tty_set_termios(struct tty_struct *tty,
        struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
        unsigned int cflag = tty->termios.c_cflag;
 
-       IRDA_DEBUG(2, "%s()\n", __func__ );
-
        if ((cflag == old_termios->c_cflag) &&
            (RELEVANT_IFLAG(tty->termios.c_iflag) ==
             RELEVANT_IFLAG(old_termios->c_iflag)))
@@ -198,8 +195,6 @@ int ircomm_tty_tiocmget(struct tty_struct *tty)
        struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
        unsigned int result;
 
-       IRDA_DEBUG(2, "%s()\n", __func__ );
-
        if (tty->flags & (1 << TTY_IO_ERROR))
                return -EIO;
 
@@ -223,8 +218,6 @@ int ircomm_tty_tiocmset(struct tty_struct *tty,
 {
        struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
 
-       IRDA_DEBUG(2, "%s()\n", __func__ );
-
        if (tty->flags & (1 << TTY_IO_ERROR))
                return -EIO;
 
@@ -265,8 +258,6 @@ static int ircomm_tty_get_serial_info(struct ircomm_tty_cb *self,
        if (!retinfo)
                return -EFAULT;
 
-       IRDA_DEBUG(2, "%s()\n", __func__ );
-
        memset(&info, 0, sizeof(info));
        info.line = self->line;
        info.flags = self->port.flags;
@@ -301,8 +292,6 @@ static int ircomm_tty_set_serial_info(struct ircomm_tty_cb *self,
        struct serial_struct new_serial;
        struct ircomm_tty_cb old_state, *state;
 
-       IRDA_DEBUG(0, "%s()\n", __func__ );
-
        if (copy_from_user(&new_serial,new_info,sizeof(new_serial)))
                return -EFAULT;
 
@@ -375,8 +364,6 @@ int ircomm_tty_ioctl(struct tty_struct *tty,
        struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
        int ret = 0;
 
-       IRDA_DEBUG(2, "%s()\n", __func__ );
-
        if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
            (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) &&
            (cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) {
@@ -392,11 +379,11 @@ int ircomm_tty_ioctl(struct tty_struct *tty,
                ret = ircomm_tty_set_serial_info(self, (struct serial_struct __user *) arg);
                break;
        case TIOCMIWAIT:
-               IRDA_DEBUG(0, "(), TIOCMIWAIT, not impl!\n");
+               pr_debug("(), TIOCMIWAIT, not impl!\n");
                break;
 
        case TIOCGICOUNT:
-               IRDA_DEBUG(0, "%s(), TIOCGICOUNT not impl!\n", __func__ );
+               pr_debug("%s(), TIOCGICOUNT not impl!\n", __func__);
 #if 0
                save_flags(flags); cli();
                cnow = driver->icount;