Module Name: src Committed By: thorpej Date: Sun Mar 28 20:41:04 UTC 2021
Modified Files: src/sys/dev/pci [thorpej-cfargs]: mfii.c mpii.c Log Message: No need to pass interface attribute or locators to config_found(). To generate a diff of this commit: cvs rdiff -u -r1.7.4.2 -r1.7.4.3 src/sys/dev/pci/mfii.c cvs rdiff -u -r1.27.2.2 -r1.27.2.3 src/sys/dev/pci/mpii.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/pci/mfii.c diff -u src/sys/dev/pci/mfii.c:1.7.4.2 src/sys/dev/pci/mfii.c:1.7.4.3 --- src/sys/dev/pci/mfii.c:1.7.4.2 Mon Mar 22 16:23:45 2021 +++ src/sys/dev/pci/mfii.c Sun Mar 28 20:41:04 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mfii.c,v 1.7.4.2 2021/03/22 16:23:45 thorpej Exp $ */ +/* $NetBSD: mfii.c,v 1.7.4.3 2021/03/28 20:41:04 thorpej Exp $ */ /* $OpenBSD: mfii.c,v 1.58 2018/08/14 05:22:21 jmatthew Exp $ */ /* @@ -19,7 +19,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.7.4.2 2021/03/22 16:23:45 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mfii.c,v 1.7.4.3 2021/03/28 20:41:04 thorpej Exp $"); #include "bio.h" @@ -988,13 +988,11 @@ static int mfii_rescan(device_t self, const char *ifattr, const int *locators) { struct mfii_softc *sc = device_private(self); + if (sc->sc_child != NULL) return 0; - sc->sc_child = config_found(self, &sc->sc_chan, scsiprint, - CFARG_IATTR, ifattr, - CFARG_LOCATORS, locators, - CFARG_EOL); + sc->sc_child = config_found(self, &sc->sc_chan, scsiprint, CFARG_EOL); return 0; } Index: src/sys/dev/pci/mpii.c diff -u src/sys/dev/pci/mpii.c:1.27.2.2 src/sys/dev/pci/mpii.c:1.27.2.3 --- src/sys/dev/pci/mpii.c:1.27.2.2 Mon Mar 22 16:23:45 2021 +++ src/sys/dev/pci/mpii.c Sun Mar 28 20:41:04 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mpii.c,v 1.27.2.2 2021/03/22 16:23:45 thorpej Exp $ */ +/* $NetBSD: mpii.c,v 1.27.2.3 2021/03/28 20:41:04 thorpej Exp $ */ /* $OpenBSD: mpii.c,v 1.115 2018/08/14 05:22:21 jmatthew Exp $ */ /* * Copyright (c) 2010, 2012 Mike Belopuhov @@ -20,7 +20,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.27.2.2 2021/03/22 16:23:45 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.27.2.3 2021/03/28 20:41:04 thorpej Exp $"); #include "bio.h" @@ -726,10 +726,7 @@ mpii_rescan(device_t self, const char *i if (sc->sc_child != NULL) return 0; - sc->sc_child = config_found(self, &sc->sc_chan, scsiprint, - CFARG_IATTR, ifattr, - CFARG_LOCATORS, locators, - CFARG_EOL); + sc->sc_child = config_found(self, &sc->sc_chan, scsiprint, CFARG_EOL); return 0; }