From fd1b5b2eb0ba28ed9d6d934fd375a1472396e54a Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sun, 7 Sep 2014 20:09:45 +0200 Subject: [PATCH] nexus/x86_64: Add a description to the RAM driver but quiet it. Also, some more whitespace cleanup. Patch-by: profmakx --- sys/platform/pc64/x86_64/nexus.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/platform/pc64/x86_64/nexus.c b/sys/platform/pc64/x86_64/nexus.c index 1c165ec471..39626b3244 100644 --- a/sys/platform/pc64/x86_64/nexus.c +++ b/sys/platform/pc64/x86_64/nexus.c @@ -637,7 +637,6 @@ nexus_release_msix(device_t dev, device_t child, int irq, int cpuid) static void ram_identify(driver_t *driver, device_t parent) { - if (resource_disabled("ram", 0)) return; if (BUS_ADD_CHILD(parent, parent, 0, "ram", 0) == NULL) @@ -647,7 +646,6 @@ ram_identify(driver_t *driver, device_t parent) static int ram_probe(device_t dev) { - device_quiet(dev); device_set_desc(dev, "System RAM"); return (0); @@ -663,6 +661,9 @@ ram_attach(device_t dev) uint32_t smapsize; int error, rid; + device_quiet(dev); + device_set_desc(dev, "System RAM"); + /* Retrieve the system memory map from the loader. */ kmdp = preload_search_by_type("elf kernel"); if (kmdp == NULL) @@ -721,7 +722,7 @@ ram_attach(device_t dev) static device_method_t ram_methods[] = { /* Device interface */ DEVMETHOD(device_identify, ram_identify), - DEVMETHOD(device_probe, ram_probe), + DEVMETHOD(device_probe, ram_probe), DEVMETHOD(device_attach, ram_attach), { 0, 0 } }; @@ -733,6 +734,4 @@ static driver_t ram_driver = { }; static devclass_t ram_devclass; - DRIVER_MODULE(ram, nexus, ram_driver, ram_devclass, NULL, NULL); - -- 2.41.0