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

Commit 4bfe090b authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

serial: struct device - replace bus_id with dev_name(), dev_set_name() 



Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bb0dc43e

drivers/serial/serial_core.c

+2 −2
Original line number Diff line number Diff line
@@ -2030,7 +2030,7 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port) 
		if (!tries)

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

					"transmitter\n",

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

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

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

			       drv->dev_name,

			       drv->tty_driver->name_base + port->line);
@@ -2156,7 +2156,7 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port) 
	}



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

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

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

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

	       drv->dev_name,

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