Revert "tty: serial: pl011: add ttyAMA for matching pl011 console"

Aleksey Makarov · gregkh · commit b767ad726c2a · 2017-03-17T14:04:06.000+09:00
The original patch makes the condition always true, so it is wrong. It masks (but not fixes) the bug described in the commit message but introduces a regression (no console is selected by SPCR) in regular (no 'console=ttyAMA') case. s/||/&&/ would not fix the problem as the root cause was identified incorrectly. This reverts commit aea9a80. Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Sudeep Holla <sudeep.holla@arm.com> Tested-by: Jayachandran C <jnair@caviumnetworks.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
@@ -2373,7 +2373,7 @@ static int __init pl011_console_match(struct console *co, char *name, int idx,
 	if (strcmp(name, "qdf2400_e44") == 0) {
 		pr_info_once("UART: Working around QDF2400 SoC erratum 44");
 		qdf2400_e44_present = true;
-	} else if (strcmp(name, "pl011") != 0 || strcmp(name, "ttyAMA") != 0) {
+	} else if (strcmp(name, "pl011") != 0) {
 		return -ENODEV;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2373,7 +2373,7 @@ static int __init pl011_console_match(struct console co, char name, int idx,`
`2373`	`2373`	`if (strcmp(name, "qdf2400_e44") == 0) {`
`2374`	`2374`	`pr_info_once("UART: Working around QDF2400 SoC erratum 44");`
`2375`	`2375`	`qdf2400_e44_present = true;`
`2376`		`- } else if (strcmp(name, "pl011") != 0 \|\| strcmp(name, "ttyAMA") != 0) {`
	`2376`	`+ } else if (strcmp(name, "pl011") != 0) {`
`2377`	`2377`	`return -ENODEV;`
`2378`	`2378`	`}`
`2379`	`2379`