Garbage-collect the "isa_knowndev" stuff; nothing used it.

Author: thorpej

sys/dev/isa/isa.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: isa.c,v 1.141 2025/10/03 14:14:36 thorpej Exp $	*/
+/*	$NetBSD: isa.c,v 1.142 2025/10/17 16:56:00 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa.c,v 1.141 2025/10/03 14:14:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa.c,v 1.142 2025/10/17 16:56:00 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -58,16 +58,11 @@ int	isamatch(device_t, cfdata_t, void *);
 void	isaattach(device_t, device_t, void *);
 int	isadetach(device_t, int);
 int	isarescan(device_t, const char *, const int *);
-void	isachilddetached(device_t, device_t);
 int	isaprint(void *, const char *);
 
 CFATTACH_DECL2_NEW(isa, sizeof(struct isa_softc),
-    isamatch, isaattach, isadetach, NULL, isarescan, isachilddetached);
+    isamatch, isaattach, isadetach, NULL, isarescan, NULL);
 
-void	isa_attach_knowndevs(struct isa_softc *);
-void	isa_free_knowndevs(struct isa_softc *);
-
-int	isasubmatch(device_t, cfdata_t, const int *, void *);
 int	isasearch(device_t, cfdata_t, const int *, void *);
 
 static int	isa_slotcount = -1;	/* -1 == don't know how many */
@@ -95,17 +90,12 @@ isaattach(device_t parent, device_t self, void *aux)
 		[ISACF_DRQ2]  = ISACF_DRQ2_DEFAULT,
 	};
 
-	TAILQ_INIT(&sc->sc_knowndevs);
-	sc->sc_dynamicdevs = 0;
-
 	sc->sc_dev = self;
 
 	isa_attach_hook(parent, self, iba);
 	aprint_naive("\n");
 	aprint_normal("\n");
 
-	/* XXX Add code to fetch known-devices. */
-
 	sc->sc_iot = iba->iba_iot;
 	sc->sc_memt = iba->iba_memt;
 	sc->sc_dmat = iba->iba_dmat;
@@ -125,16 +115,6 @@ isaattach(device_t parent, device_t self, void *aux)
 	isa_dmainit(sc->sc_ic, sc->sc_iot, sc->sc_dmat, self);
 #endif
 
-	/* Attach all direct-config children. */
-	isa_attach_knowndevs(sc);
-
-	/*
-	 * If we don't support dynamic hello/goodbye of devices,
-	 * then free the knowndevs info now.
-	 */
-	if (sc->sc_dynamicdevs == 0)
-		isa_free_knowndevs(sc);
-
 	/* Attach all indirect-config children. */
 	isarescan(self, NULL, wildcard);
 
@@ -153,8 +133,6 @@ isadetach(device_t self, int flags)
 
 	pmf_device_deregister(self);
 
-	isa_free_knowndevs(sc);
-
 #if NISADMA > 0
 	isa_dmadestroy(sc->sc_ic);
 #endif
@@ -192,86 +170,6 @@ isarescan(device_t self, const char *ifattr, const int *locators)
 	return (0);
 }
 
-void
-isachilddetached(device_t self, device_t child)
-{
-	struct isa_knowndev *ik;
-	struct isa_softc *sc = device_private(self);
-
-	TAILQ_FOREACH(ik, &sc->sc_knowndevs, ik_list) {
-		if (ik->ik_claimed == child)
-			ik->ik_claimed = NULL;
-	}
-}
-
-void
-isa_attach_knowndevs(struct isa_softc *sc)
-{
-	struct isa_attach_args ia;
-	struct isa_knowndev *ik;
-
-	if (TAILQ_EMPTY(&sc->sc_knowndevs))
-		return;
-
-	TAILQ_FOREACH(ik, &sc->sc_knowndevs, ik_list) {
-		if (ik->ik_claimed != NULL)
-			continue;
-
-		ia.ia_iot = sc->sc_iot;
-		ia.ia_memt = sc->sc_memt;
-		ia.ia_dmat = sc->sc_dmat;
-		ia.ia_ic = sc->sc_ic;
-
-		ia.ia_pnpname = ik->ik_pnpname;
-		ia.ia_pnpcompatnames = ik->ik_pnpcompatnames;
-
-		ia.ia_io = ik->ik_io;
-		ia.ia_nio = ik->ik_nio;
-
-		ia.ia_iomem = ik->ik_iomem;
-		ia.ia_niomem = ik->ik_niomem;
-
-		ia.ia_irq = ik->ik_irq;
-		ia.ia_nirq = ik->ik_nirq;
-
-		ia.ia_drq = ik->ik_drq;
-		ia.ia_ndrq = ik->ik_ndrq;
-
-		ia.ia_aux = NULL;
-
-		/* XXX should setup locator array */
-
-		ik->ik_claimed = config_found(sc->sc_dev, &ia, isaprint,
-		    CFARGS(.submatch = isasubmatch));
-	}
-}
-
-void
-isa_free_knowndevs(struct isa_softc *sc)
-{
-	struct isa_knowndev *ik;
-	struct isa_pnpname *ipn;
-
-#define	FREEIT(x)	if (x != NULL) free(x, M_DEVBUF)
-
-	while ((ik = TAILQ_FIRST(&sc->sc_knowndevs)) != NULL) {
-		TAILQ_REMOVE(&sc->sc_knowndevs, ik, ik_list);
-		FREEIT(ik->ik_pnpname);
-		while ((ipn = ik->ik_pnpcompatnames) != NULL) {
-			ik->ik_pnpcompatnames = ipn->ipn_next;
-			free(ipn->ipn_name, M_DEVBUF);
-			free(ipn, M_DEVBUF);
-		}
-		FREEIT(ik->ik_io);
-		FREEIT(ik->ik_iomem);
-		FREEIT(ik->ik_irq);
-		FREEIT(ik->ik_drq);
-		free(ik, M_DEVBUF);
-	}
-
-#undef FREEIT
-}
-
 static int
 checkattachargs(struct isa_attach_args *ia, const int *loc)
 {
@@ -326,17 +224,6 @@ checkattachargs(struct isa_attach_args *ia, const int *loc)
 	return (1);
 }
 
-int
-isasubmatch(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
-{
-	struct isa_attach_args *ia = aux;
-
-	if (!checkattachargs(ia, cf->cf_loc))
-		return (0);
-
-	return (config_match(parent, cf, aux));
-}
-
 int
 isaprint(void *aux, const char *isa)
 {

sys/dev/isa/isavar.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: isavar.h,v 1.53 2009/05/12 09:10:15 cegger Exp $	*/
+/*	$NetBSD: isavar.h,v 1.54 2025/10/17 16:56:00 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997, 2001 The NetBSD Foundation, Inc.
@@ -120,49 +120,6 @@ struct isa_pnpname {
 	char *ipn_name;
 };
 
-/*
- * Machine-dependent code provides a list of these to describe
- * devices on the ISA bus which should be attached via direct
- * configuration.
- *
- * All of this information is dynamically allocated, so that
- * the ISA bus driver may free all of this information if the
- * bus does not support dynamic attach/detach of devices (e.g.
- * on a docking station).
- *
- * Some info on the "ik_key" field: This is a unique number for
- * each knowndev node.  If, when we need to re-enumerate the
- * knowndevs, we discover that a node with key N is in the old
- * list but not in the new, the device has disappeared.  Similarly,
- * if a node with key M is in the new list but not in the old,
- * the device is new.  Note that the knowndevs list must be
- * sorted in ascending "key" order.
- */
-struct isa_knowndev {
-	TAILQ_ENTRY(isa_knowndev) ik_list;
-	uintptr_t ik_key;
-	device_t ik_claimed;
-
-	/*
-	 * The rest of these fields correspond to isa_attach_args
-	 * fields.
-	 */
-	char *ik_pnpname;
-	struct isa_pnpname *ik_pnpcompatnames;
-
-	struct isa_io *ik_io;
-	int ik_nio;
-
-	struct isa_iomem *ik_iomem;
-	int ik_niomem;
-
-	struct isa_irq *ik_irq;
-	int ik_nirq;
-
-	struct isa_drq *ik_drq;
-	int ik_ndrq;
-};
-
 /*
  * ISA driver attach arguments
  */
@@ -215,9 +172,6 @@ struct isa_softc {
 	bus_dma_tag_t sc_dmat;		/* isa DMA tag */
 
 	isa_chipset_tag_t sc_ic;
-
-	TAILQ_HEAD(, isa_knowndev) sc_knowndevs;
-	int sc_dynamicdevs;
 };
 
 /*