Commit b0ae33a2 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Greg Kroah-Hartman
Browse files

usb: early: xhci-dbc: Remove duplicate keep parsing 



The generic earlyprintk= parsing already parses the optional ",keep",
no need to duplicate that in the xdbc driver.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220304152135.975568860@infradead.org


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

arch/x86/kernel/early_printk.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static int __init setup_early_printk(char *buf) 
#endif

#ifdef CONFIG_EARLY_PRINTK_USB_XDBC

		if (!strncmp(buf, "xdbc", 4))

			early_xdbc_parse_parameter(buf + 4);

			early_xdbc_parse_parameter(buf + 4, keep);

#endif



		buf++;

drivers/usb/early/xhci-dbc.c

+2 −3
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ static int __init xdbc_early_setup(void) 
	return 0;

}



int __init early_xdbc_parse_parameter(char *s)

int __init early_xdbc_parse_parameter(char *s, int keep_early)

{

	unsigned long dbgp_num = 0;

	u32 bus, dev, func, offset;
@@ -608,8 +608,7 @@ int __init early_xdbc_parse_parameter(char *s) 
	if (!early_pci_allowed())

		return -EPERM;



	if (strstr(s, "keep"))

		early_console_keep = true;

	early_console_keep = keep_early;



	if (xdbc.xdbc_reg)

		return 0;

include/linux/usb/xhci-dbgp.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#define __LINUX_XHCI_DBGP_H



#ifdef CONFIG_EARLY_PRINTK_USB_XDBC

int __init early_xdbc_parse_parameter(char *s);

int __init early_xdbc_parse_parameter(char *s, int keep_early);

int __init early_xdbc_setup_hardware(void);

void __init early_xdbc_register_console(void);

#else