Module Name: src
Committed By: riastradh
Date: Sat Feb 12 02:40:20 UTC 2022
Modified Files:
src/sys/dev/qbus: ts.c
Log Message:
ts(4): Skip fabricating bogus struct device in tsmatch.
Doesn't appear to be used anywhere in tsmatch. Let's not invent
bogus autoconf guts here.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/qbus/ts.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/qbus/ts.c
diff -u src/sys/dev/qbus/ts.c:1.34 src/sys/dev/qbus/ts.c:1.35
--- src/sys/dev/qbus/ts.c:1.34 Sat Jan 1 10:32:29 2022
+++ src/sys/dev/qbus/ts.c Sat Feb 12 02:40:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ts.c,v 1.34 2022/01/01 10:32:29 msaitoh Exp $ */
+/* $NetBSD: ts.c,v 1.35 2022/02/12 02:40:20 riastradh Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ts.c,v 1.34 2022/01/01 10:32:29 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ts.c,v 1.35 2022/02/12 02:40:20 riastradh Exp $");
#undef TSDEBUG
@@ -215,7 +215,6 @@ const struct cdevsw ts_cdevsw = {
int
tsmatch(device_t parent, cfdata_t match, void *aux)
{
- struct device tsdev;
struct ts_softc ssc;
struct ts_softc *sc = &ssc;
struct uba_attach_args *ua = aux;
@@ -224,9 +223,7 @@ tsmatch(device_t parent, cfdata_t match,
sc->sc_iot = ua->ua_iot;
sc->sc_ioh = ua->ua_ioh;
sc->sc_mapped = 0;
- sc->sc_dev = &tsdev;
sc->sc_uh = device_private(parent);
- strcpy(sc->sc_dev->dv_xname, "ts");
/* Try to reset the device */
for (i = 0; i < 3; i++) {
