Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit e406c56

Browse files
committed
Revert "serial: core: Handle serial console options"
This reverts commit a0f32e2. 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: Petr Mladek <pmladek@suse.com> Reported-by: Tony 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 740a796 commit e406c56

File tree

1 file changed

+0
-49
lines changed

1 file changed

+0
-49
lines changed

drivers/tty/serial/serial_base_bus.c

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -219,58 +219,9 @@ static int serial_base_add_one_prefcon(const char *match, const char *dev_name,
219219
return ret;
220220
}
221221

222-
#ifdef __sparc__
223-
224-
/* Handle Sparc ttya and ttyb options as done in console_setup() */
225-
static int serial_base_add_sparc_console(const char *dev_name, int idx)
226-
{
227-
const char *name;
228-
229-
switch (idx) {
230-
case 0:
231-
name = "ttya";
232-
break;
233-
case 1:
234-
name = "ttyb";
235-
break;
236-
default:
237-
return 0;
238-
}
239-
240-
return serial_base_add_one_prefcon(name, dev_name, idx);
241-
}
242-
243-
#else
244-
245-
static inline int serial_base_add_sparc_console(const char *dev_name, int idx)
246-
{
247-
return 0;
248-
}
249-
250-
#endif
251-
252222
static int serial_base_add_prefcon(const char *name, int idx)
253223
{
254224
const char *char_match __free(kfree) = NULL;
255-
const char *nmbr_match __free(kfree) = NULL;
256-
int ret;
257-
258-
/* Handle ttyS specific options */
259-
if (strstarts(name, "ttyS")) {
260-
/* No name, just a number */
261-
nmbr_match = kasprintf(GFP_KERNEL, "%i", idx);
262-
if (!nmbr_match)
263-
return -ENODEV;
264-
265-
ret = serial_base_add_one_prefcon(nmbr_match, name, idx);
266-
if (ret)
267-
return ret;
268-
269-
/* Sparc ttya and ttyb */
270-
ret = serial_base_add_sparc_console(name, idx);
271-
if (ret)
272-
return ret;
273-
}
274225

275226
/* Handle the traditional character device name style console=ttyS0 */
276227
char_match = kasprintf(GFP_KERNEL, "%s%i", name, idx);

0 commit comments

Comments
 (0)