tty: Use of_node_name_{eq,prefix} for node name comparisons
Convert string compares of DT node names to use of_node_name_eq helper instead. This removes direct access to the node name pointer. For hvc, the code can also be simplified by using of_stdout pointer instead of searching again for the stdout node. Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Jiri Slaby <jslaby@suse.com> Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-serial@vger.kernel.org Cc: sparclinux@vger.kernel.org Signed-off-by: Rob Herring <robh@kernel.org> Acked-by: Michael Ellerman <mpe@ellerman.id.au> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

父節點
d72402145a
當前提交
778ec49c14
@@ -1648,9 +1648,9 @@ static int __init pmz_probe(void)
|
||||
*/
|
||||
node_a = node_b = NULL;
|
||||
for (np = NULL; (np = of_get_next_child(node_p, np)) != NULL;) {
|
||||
if (strncmp(np->name, "ch-a", 4) == 0)
|
||||
if (of_node_name_prefix(np, "ch-a"))
|
||||
node_a = of_node_get(np);
|
||||
else if (strncmp(np->name, "ch-b", 4) == 0)
|
||||
else if (of_node_name_prefix(np, "ch-b"))
|
||||
node_b = of_node_get(np);
|
||||
}
|
||||
if (!node_a && !node_b) {
|
||||
|
@@ -89,14 +89,14 @@ void sunserial_console_termios(struct console *con, struct device_node *uart_dp)
|
||||
int baud, bits, stop, cflag;
|
||||
char parity;
|
||||
|
||||
if (!strcmp(uart_dp->name, "rsc") ||
|
||||
!strcmp(uart_dp->name, "rsc-console") ||
|
||||
!strcmp(uart_dp->name, "rsc-control")) {
|
||||
if (of_node_name_eq(uart_dp, "rsc") ||
|
||||
of_node_name_eq(uart_dp, "rsc-console") ||
|
||||
of_node_name_eq(uart_dp, "rsc-control")) {
|
||||
mode = of_get_property(uart_dp,
|
||||
"ssp-console-modes", NULL);
|
||||
if (!mode)
|
||||
mode = "115200,8,n,1,-";
|
||||
} else if (!strcmp(uart_dp->name, "lom-console")) {
|
||||
} else if (of_node_name_eq(uart_dp, "lom-console")) {
|
||||
mode = "9600,8,n,1,-";
|
||||
} else {
|
||||
struct device_node *dp;
|
||||
|
@@ -1482,8 +1482,8 @@ static int su_probe(struct platform_device *op)
|
||||
up->port.ops = &sunsu_pops;
|
||||
|
||||
ignore_line = false;
|
||||
if (!strcmp(dp->name, "rsc-console") ||
|
||||
!strcmp(dp->name, "lom-console"))
|
||||
if (of_node_name_eq(dp, "rsc-console") ||
|
||||
of_node_name_eq(dp, "lom-console"))
|
||||
ignore_line = true;
|
||||
|
||||
sunserial_console_match(SUNSU_CONSOLE(), dp,
|
||||
|
Reference in New Issue
Block a user