projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerpc: Remove powerpc specific cmd_line
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
tty
/
hvc
/
hvc_vio.c
diff --git
a/drivers/tty/hvc/hvc_vio.c
b/drivers/tty/hvc/hvc_vio.c
index b594abfbf21e76d58acc1df534a30f603670fb5a..f575a9b5ede7b05bd24c87ecf58425e89ec20fdc 100644
(file)
--- a/
drivers/tty/hvc/hvc_vio.c
+++ b/
drivers/tty/hvc/hvc_vio.c
@@
-404,42
+404,35
@@
module_exit(hvc_vio_exit);
void __init hvc_vio_init_early(void)
{
void __init hvc_vio_init_early(void)
{
- struct device_node *stdout_node;
const __be32 *termno;
const char *name;
const struct hv_ops *ops;
/* find the boot console from /chosen/stdout */
const __be32 *termno;
const char *name;
const struct hv_ops *ops;
/* find the boot console from /chosen/stdout */
- if (!of_
chosen
)
+ if (!of_
stdout
)
return;
return;
- name = of_get_property(of_chosen, "linux,stdout-path", NULL);
- if (name == NULL)
- return;
- stdout_node = of_find_node_by_path(name);
- if (!stdout_node)
- return;
- name = of_get_property(stdout_node, "name", NULL);
+ name = of_get_property(of_stdout, "name", NULL);
if (!name) {
printk(KERN_WARNING "stdout node missing 'name' property!\n");
if (!name) {
printk(KERN_WARNING "stdout node missing 'name' property!\n");
-
goto out
;
+
return
;
}
/* Check if it's a virtual terminal */
if (strncmp(name, "vty", 3) != 0)
}
/* Check if it's a virtual terminal */
if (strncmp(name, "vty", 3) != 0)
-
goto out
;
- termno = of_get_property(
stdout_node
, "reg", NULL);
+
return
;
+ termno = of_get_property(
of_stdout
, "reg", NULL);
if (termno == NULL)
if (termno == NULL)
-
goto out
;
+
return
;
hvterm_priv0.termno = of_read_number(termno, 1);
spin_lock_init(&hvterm_priv0.buf_lock);
hvterm_privs[0] = &hvterm_priv0;
/* Check the protocol */
hvterm_priv0.termno = of_read_number(termno, 1);
spin_lock_init(&hvterm_priv0.buf_lock);
hvterm_privs[0] = &hvterm_priv0;
/* Check the protocol */
- if (of_device_is_compatible(
stdout_node
, "hvterm1")) {
+ if (of_device_is_compatible(
of_stdout
, "hvterm1")) {
hvterm_priv0.proto = HV_PROTOCOL_RAW;
ops = &hvterm_raw_ops;
}
hvterm_priv0.proto = HV_PROTOCOL_RAW;
ops = &hvterm_raw_ops;
}
- else if (of_device_is_compatible(
stdout_node
, "hvterm-protocol")) {
+ else if (of_device_is_compatible(
of_stdout
, "hvterm-protocol")) {
hvterm_priv0.proto = HV_PROTOCOL_HVSI;
ops = &hvterm_hvsi_ops;
hvsilib_init(&hvterm_priv0.hvsi, hvc_get_chars, hvc_put_chars,
hvterm_priv0.proto = HV_PROTOCOL_HVSI;
ops = &hvterm_hvsi_ops;
hvsilib_init(&hvterm_priv0.hvsi, hvc_get_chars, hvc_put_chars,
@@
-447,7
+440,7
@@
void __init hvc_vio_init_early(void)
/* HVSI, perform the handshake now */
hvsilib_establish(&hvterm_priv0.hvsi);
} else
/* HVSI, perform the handshake now */
hvsilib_establish(&hvterm_priv0.hvsi);
} else
-
goto out
;
+
return
;
udbg_putc = udbg_hvc_putc;
udbg_getc = udbg_hvc_getc;
udbg_getc_poll = udbg_hvc_getc_poll;
udbg_putc = udbg_hvc_putc;
udbg_getc = udbg_hvc_getc;
udbg_getc_poll = udbg_hvc_getc_poll;
@@
-456,14
+449,12
@@
void __init hvc_vio_init_early(void)
* backend for HVSI, only do udbg
*/
if (hvterm_priv0.proto == HV_PROTOCOL_HVSI)
* backend for HVSI, only do udbg
*/
if (hvterm_priv0.proto == HV_PROTOCOL_HVSI)
-
goto out
;
+
return
;
#endif
/* Check whether the user has requested a different console. */
#endif
/* Check whether the user has requested a different console. */
- if (!strstr(
cm
d_line, "console="))
+ if (!strstr(
boot_comman
d_line, "console="))
add_preferred_console("hvc", 0, NULL);
hvc_instantiate(0, 0, ops);
add_preferred_console("hvc", 0, NULL);
hvc_instantiate(0, 0, ops);
-out:
- of_node_put(stdout_node);
}
/* call this from early_init() for a working debug console on
}
/* call this from early_init() for a working debug console on