From d8abea909bd0a9a3a2a6f0a7116a9cb5721bab36 Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Mon, 16 Apr 2012 17:51:14 +0800 Subject: [PATCH] bus: Change device_getenv_int interface a little bit - Pass in the fallback value - If the kgetenv fails, fallback value will be returned --- sys/bus/pci/pci.c | 6 +++--- sys/kern/subr_bus.c | 7 +++---- sys/sys/bus.h | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/bus/pci/pci.c b/sys/bus/pci/pci.c index f752fa102b..701ec9a523 100644 --- a/sys/bus/pci/pci.c +++ b/sys/bus/pci/pci.c @@ -4103,11 +4103,11 @@ pci_alloc_1intr(device_t dev, int msi_enable, int *rid0, u_int *flags0) type = PCI_INTR_TYPE_LEGACY; flags = RF_SHAREABLE | RF_ACTIVE; - device_getenv_int(dev, "msi.enable", &msi_enable); + msi_enable = device_getenv_int(dev, "msi.enable", msi_enable); if (msi_enable) { - int cpu = -1; + int cpu; - device_getenv_int(dev, "msi.cpu", &cpu); + cpu = device_getenv_int(dev, "msi.cpu", -1); if (cpu >= ncpus) cpu = ncpus - 1; diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 3a089ecd6b..50332d0252 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -3484,12 +3484,11 @@ intr_str_trigger(enum intr_trigger trig) } int -device_getenv_int(device_t dev, const char *knob, int *data) +device_getenv_int(device_t dev, const char *knob, int def) { char env[128]; - int ret; ksnprintf(env, sizeof(env), "hw.%s.%s", device_get_nameunit(dev), knob); - ret = kgetenv_int(env, data); - return ret; + kgetenv_int(env, &def); + return def; } diff --git a/sys/sys/bus.h b/sys/sys/bus.h index 96e75192de..0bd575cc17 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -388,7 +388,7 @@ int device_set_unit(device_t dev, int unit); /* XXX DONT USE XXX */ int device_shutdown(device_t dev); void device_unbusy(device_t dev); void device_verbose(device_t dev); -int device_getenv_int(device_t dev, const char *knob, int *data); +int device_getenv_int(device_t dev, const char *knob, int def); /* * Access functions for devclass. -- 2.41.0