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: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220304152135.975568860@infradead.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
index d3c531d3b2449c174ef095dec5c4f430996b2f18..68b38925a74f085bcd87b24698b9074b95b5060e 100644 (file)
--- a/arch/x86/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
@@ -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++;

diff --git a/drivers/usb/early/xhci-dbc.c b/drivers/usb/early/xhci-dbc.c
index 4502108069cd9252e9888c10e80989dcce5a3326..100a45d26b5a9063adcf8dbfffdb5eff617b03ad 100644 (file)
--- a/drivers/usb/early/xhci-dbc.c
+++ b/drivers/usb/early/xhci-dbc.c
@@ -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;

diff --git a/include/linux/usb/xhci-dbgp.h b/include/linux/usb/xhci-dbgp.h
index 0a37f1283bf0b4b0bedc390a2aca3b07b0c909b9..01fe768873f94f28bbc372866d7f53246e2024b8 100644 (file)
--- a/include/linux/usb/xhci-dbgp.h
+++ b/include/linux/usb/xhci-dbgp.h
@@ -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