leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Peter Zijlstra
2022-03-04 16:19:55 +01:00
committed by Greg Kroah-Hartman
parent 69f8aeab43
commit b0ae33a2d2
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/early_printk.c
View File

@@ -387,7 +387,7 @@ static int __init setup_early_printk(char *buf)
#endif #endif
#ifdef CONFIG_EARLY_PRINTK_USB_XDBC #ifdef CONFIG_EARLY_PRINTK_USB_XDBC
if (!strncmp(buf, "xdbc", 4)) if (!strncmp(buf, "xdbc", 4))
early_xdbc_parse_parameter(buf + 4); early_xdbc_parse_parameter(buf + 4, keep);
#endif #endif
buf++; buf++;

5
drivers/usb/early/xhci-dbc.c
View File

@@ -599,7 +599,7 @@ static int __init xdbc_early_setup(void)
return 0; 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; unsigned long dbgp_num = 0;
u32 bus, dev, func, offset; u32 bus, dev, func, offset;
@@ -608,8 +608,7 @@ int __init early_xdbc_parse_parameter(char *s)
if (!early_pci_allowed()) if (!early_pci_allowed())
return -EPERM; return -EPERM;
if (strstr(s, "keep")) early_console_keep = keep_early;
early_console_keep = true;
if (xdbc.xdbc_reg) if (xdbc.xdbc_reg)
return 0; return 0;

2
include/linux/usb/xhci-dbgp.h
View File

@@ -15,7 +15,7 @@
#define __LINUX_XHCI_DBGP_H #define __LINUX_XHCI_DBGP_H
#ifdef CONFIG_EARLY_PRINTK_USB_XDBC #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); int __init early_xdbc_setup_hardware(void);
void __init early_xdbc_register_console(void); void __init early_xdbc_register_console(void);
#else #else