Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f2dafe7 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Greg Kroah-Hartman
Browse files

serial: serial_core.c: printk replacement 



printk replaced with corresponding dev_* .
fixed two broken user-visible strings used by the corresponding printk.
the null check for uport->dev and port->dev is removed as dev_* will check for
null while printing.
printing of dev_name(uport->dev) and dev_name(port->dev) also removed as those
are being printed by dev_* .

Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a1d51aa2

drivers/tty/serial/serial_core.c

+11 −15
Original line number Diff line number Diff line
@@ -892,9 +892,10 @@ static int uart_set_info(struct tty_struct *tty, struct tty_port *port, 
			 */

			if (uport->flags & UPF_SPD_MASK) {

				char buf[64];

				printk(KERN_NOTICE

				       "%s sets custom speed on %s. This "

				       "is deprecated.\n", current->comm,



				dev_notice(uport->dev,

				       "%s sets custom speed on %s. This is deprecated.\n",

				      current->comm,

				      tty_name(port->tty, buf));

			}

			uart_change_speed(tty, state, NULL);
@@ -1975,10 +1976,7 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport) 
		for (tries = 3; !ops->tx_empty(uport) && tries; tries--)

			msleep(10);

		if (!tries)

			printk(KERN_ERR "%s%s%s%d: Unable to drain "

					"transmitter\n",

			       uport->dev ? dev_name(uport->dev) : "",

			       uport->dev ? ": " : "",

			dev_err(uport->dev, "%s%d: Unable to drain transmitter\n",

				drv->dev_name,

				drv->tty_driver->name_base + uport->line);
@@ -2109,9 +2107,7 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port) 
		break;

	}



	printk(KERN_INFO "%s%s%s%d at %s (irq = %d, base_baud = %d) is a %s\n",

	       port->dev ? dev_name(port->dev) : "",

	       port->dev ? ": " : "",

	dev_info(port->dev, "%s%d at %s (irq = %d, base_baud = %d) is a %s\n",

	       drv->dev_name,

	       drv->tty_driver->name_base + port->line,

	       address, port->irq, port->uartclk / 16, uart_type(port));
@@ -2640,7 +2636,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport) 
	if (likely(!IS_ERR(tty_dev))) {

		device_set_wakeup_capable(tty_dev, 1);

	} else {

		printk(KERN_ERR "Cannot register tty device on line %d\n",

		dev_err(uport->dev, "Cannot register tty device on line %d\n",

		       uport->line);

	}
@@ -2675,7 +2671,7 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *uport) 
	BUG_ON(in_interrupt());



	if (state->uart_port != uport)

		printk(KERN_ALERT "Removing wrong port: %p != %p\n",

		dev_alert(uport->dev, "Removing wrong port: %p != %p\n",

			state->uart_port, uport);



	mutex_lock(&port_mutex);