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

Commit 085fb962 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: console.c: remove err() usage 



err() was a very old USB-specific macro that I thought had
gone away.  This patch removes it from being used in the
driver and uses dev_err() instead.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 45714104

drivers/usb/serial/console.c

+5 −4
Original line number Diff line number Diff line
@@ -113,7 +113,8 @@ static int usb_console_setup(struct console *co, char *options) 
	serial = usb_serial_get_by_index(co->index);

	if (serial == NULL) {

		/* no device is connected yet, sorry :( */

		err("No USB device connected to ttyUSB%i", co->index);

		printk(KERN_ERR "No USB device connected to ttyUSB%i\n",

		       co->index);

		return -ENODEV;

	}
@@ -137,7 +138,7 @@ static int usb_console_setup(struct console *co, char *options) 
			tty = kzalloc(sizeof(*tty), GFP_KERNEL);

			if (!tty) {

				retval = -ENOMEM;

				err("no more memory");

				dev_err(&port->dev, "no more memory\n");

				goto reset_open_count;

			}

			kref_init(&tty->kref);
@@ -146,7 +147,7 @@ static int usb_console_setup(struct console *co, char *options) 
			tty->index = co->index;

			if (tty_init_termios(tty)) {

				retval = -ENOMEM;

				err("no more memory");

				dev_err(&port->dev, "no more memory\n");

				goto free_tty;

			}

		}
@@ -159,7 +160,7 @@ static int usb_console_setup(struct console *co, char *options) 
			retval = usb_serial_generic_open(NULL, port);



		if (retval) {

			err("could not open USB console port");

			dev_err(&port->dev, "could not open USB console port\n");

			goto fail;

		}