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

Revert "serial: core: Handle serial console options" 

This reverts commit a0f32e2d.

Let's roll back all of the serial core and printk console changes that
went into 6.10-rc1 as there still are problems with them that need to be
sorted out.

Link: https://lore.kernel.org/r/ZnpRozsdw6zbjqze@tlindgre-MOBL1


Reported-by: default avatarPetr Mladek <pmladek@suse.com>
Reported-by: default avatarTony Lindgren <tony@atomide.com>
Cc: Jiri Slaby <jirislaby@kernel.org>
Cc: John Ogness <john.ogness@linutronix.de>
Cc: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 740a7967

drivers/tty/serial/serial_base_bus.c

+0 −49
Original line number Diff line number Diff line
@@ -219,58 +219,9 @@ static int serial_base_add_one_prefcon(const char *match, const char *dev_name, 
	return ret;

}



#ifdef __sparc__



/* Handle Sparc ttya and ttyb options as done in console_setup() */

static int serial_base_add_sparc_console(const char *dev_name, int idx)

{

	const char *name;



	switch (idx) {

	case 0:

		name = "ttya";

		break;

	case 1:

		name = "ttyb";

		break;

	default:

		return 0;

	}



	return serial_base_add_one_prefcon(name, dev_name, idx);

}



#else



static inline int serial_base_add_sparc_console(const char *dev_name, int idx)

{

	return 0;

}



#endif



static int serial_base_add_prefcon(const char *name, int idx)

{

	const char *char_match __free(kfree) = NULL;

	const char *nmbr_match __free(kfree) = NULL;

	int ret;



	/* Handle ttyS specific options */

	if (strstarts(name, "ttyS")) {

		/* No name, just a number */

		nmbr_match = kasprintf(GFP_KERNEL, "%i", idx);

		if (!nmbr_match)

			return -ENODEV;



		ret = serial_base_add_one_prefcon(nmbr_match, name, idx);

		if (ret)

			return ret;



		/* Sparc ttya and ttyb */

		ret = serial_base_add_sparc_console(name, idx);

		if (ret)

			return ret;

	}



	/* Handle the traditional character device name style console=ttyS0 */

	char_match = kasprintf(GFP_KERNEL, "%s%i", name, idx);