Module Name: src
Committed By: thorpej
Date: Tue Mar 23 06:18:23 UTC 2021
Modified Files:
src/sys/arch/hpcmips/dev [thorpej-cfargs]: plumpcmcia.c
Log Message:
plumpcmcia has only a single interface attribute, so no need to
use config_found_ia().
While here, also fix an apparent bug left over from when device_t and
driver softcs were fully split ... config_found() takes a device_t, not
the associated softc. (Issue was masked by a case to "void *".)
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.28.32.1 src/sys/arch/hpcmips/dev/plumpcmcia.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/arch/hpcmips/dev/plumpcmcia.c
diff -u src/sys/arch/hpcmips/dev/plumpcmcia.c:1.28 src/sys/arch/hpcmips/dev/plumpcmcia.c:1.28.32.1
--- src/sys/arch/hpcmips/dev/plumpcmcia.c:1.28 Thu Jun 30 08:51:06 2016
+++ src/sys/arch/hpcmips/dev/plumpcmcia.c Tue Mar 23 06:18:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: plumpcmcia.c,v 1.28 2016/06/30 08:51:06 skrll Exp $ */
+/* $NetBSD: plumpcmcia.c,v 1.28.32.1 2021/03/23 06:18:23 thorpej Exp $ */
/*
* Copyright (c) 1999, 2000 UCHIYAMA Yasushi. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plumpcmcia.c,v 1.28 2016/06/30 08:51:06 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plumpcmcia.c,v 1.28.32.1 2021/03/23 06:18:23 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -303,14 +303,13 @@ static void
plumpcmcia_attach_socket(struct plumpcmcia_handle *ph)
{
struct pcmciabus_attach_args paa;
- struct plumpcmcia_softc *sc = device_private(ph->ph_parent);
paa.paa_busname = "pcmcia";
paa.pct = (pcmcia_chipset_tag_t)&plumpcmcia_functions;
paa.pch = (pcmcia_chipset_handle_t)ph;
- if ((ph->ph_pcmcia = config_found_ia((void*)sc, "pcmciabus", &paa,
- plumpcmcia_print))) {
+ if ((ph->ph_pcmcia = config_found(ph->ph_parent, &paa, plumpcmcia_print,
+ CFARG_EOL))) {
/* Enable slot */
plum_conf_write(ph->ph_regt, ph->ph_regh,
PLUM_PCMCIA_SLOTCTRL,
