diff options
| -rw-r--r-- | sys/dev/cfe/cfe_console.c | 3 | ||||
| -rw-r--r-- | sys/dev/ofw/ofw_console.c | 4 | ||||
| -rw-r--r-- | sys/dev/xen/console/console.c | 1 | ||||
| -rw-r--r-- | sys/sys/cons.h | 2 |
4 files changed, 2 insertions, 8 deletions
diff --git a/sys/dev/cfe/cfe_console.c b/sys/dev/cfe/cfe_console.c index 6d19947debd7..fbd44f878b7a 100644 --- a/sys/dev/cfe/cfe_console.c +++ b/sys/dev/cfe/cfe_console.c @@ -173,8 +173,7 @@ static void cfe_cninit(struct consdev *cp) { - sprintf(cp->cn_name, "cfecons"); - cp->cn_tp = cfe_tp; + strcpy(cp->cn_name, "cfecons"); } static void diff --git a/sys/dev/ofw/ofw_console.c b/sys/dev/ofw/ofw_console.c index bec52d670e56..493bb7836664 100644 --- a/sys/dev/ofw/ofw_console.c +++ b/sys/dev/ofw/ofw_console.c @@ -60,7 +60,6 @@ static struct ttydevsw ofw_ttydevsw = { .tsw_outwakeup = ofwtty_outwakeup, }; -static struct tty *ofw_tp = NULL; static int polltime; static struct callout_handle ofw_timeouthandle = CALLOUT_HANDLE_INITIALIZER(&ofw_timeouthandle); @@ -186,8 +185,7 @@ ofw_cninit(struct consdev *cp) { /* XXX: This is the alias, but that should be good enough */ - sprintf(cp->cn_name, "ofwcons"); - cp->cn_tp = ofw_tp; + strcpy(cp->cn_name, "ofwcons"); } static void diff --git a/sys/dev/xen/console/console.c b/sys/dev/xen/console/console.c index da778d6f376a..5b556c250490 100644 --- a/sys/dev/xen/console/console.c +++ b/sys/dev/xen/console/console.c @@ -107,7 +107,6 @@ static void xccnprobe(struct consdev *cp) { cp->cn_pri = CN_REMOTE; - cp->cn_tp = xccons; sprintf(cp->cn_name, "%s0", driver_name); } diff --git a/sys/sys/cons.h b/sys/sys/cons.h index 14fc9614e4f7..ac97ce437b62 100644 --- a/sys/sys/cons.h +++ b/sys/sys/cons.h @@ -61,10 +61,8 @@ struct consdev { /* kernel "return char if available" interface */ cn_putc_t *cn_putc; /* kernel putchar interface */ - struct tty *cn_tp; /* tty structure for console device */ short cn_pri; /* pecking order; the higher the better */ void *cn_arg; /* drivers method argument */ - int cn_unit; /* some drivers prefer this */ int cn_flags; /* capabilities of this console */ char cn_name[SPECNAMELEN + 1]; /* console (device) name */ }; |