diff options
| author | marius <marius@FreeBSD.org> | 2010-03-31 22:27:33 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2010-03-31 22:27:33 +0000 |
| commit | c3a56b633567b134866d8c46d23ffd3527206ed3 (patch) | |
| tree | 0a45c8a5981cc3033b50bb0cc54b745ecbefd1b4 | |
| parent | 566747b32e713b58e2eb2057e6ed8e2a68351c46 (diff) | |
| download | FreeBSD-src-c3a56b633567b134866d8c46d23ffd3527206ed3.zip FreeBSD-src-c3a56b633567b134866d8c46d23ffd3527206ed3.tar.gz | |
Don't re-implement device_get_nameunit(9).
| -rw-r--r-- | sys/sparc64/pci/apb.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/sys/sparc64/pci/apb.c b/sys/sparc64/pci/apb.c index 2f4932e..098e191 100644 --- a/sys/sparc64/pci/apb.c +++ b/sys/sparc64/pci/apb.c @@ -223,8 +223,7 @@ apb_alloc_resource(device_t dev, device_t child, int type, int *rid, */ if (start == 0 && end == ~0) { device_printf(dev, "can't decode default resource id %d for " - "%s%d, bypassing\n", *rid, device_get_name(child), - device_get_unit(child)); + "%s, bypassing\n", *rid, device_get_nameunit(child)); goto passup; } @@ -236,31 +235,28 @@ apb_alloc_resource(device_t dev, device_t child, int type, int *rid, switch (type) { case SYS_RES_IOPORT: if (!apb_checkrange(sc->sc_iomap, APB_IO_SCALE, start, end)) { - device_printf(dev, "device %s%d requested unsupported " - "I/O range 0x%lx-0x%lx\n", device_get_name(child), - device_get_unit(child), start, end); + device_printf(dev, "device %s requested unsupported " + "I/O range 0x%lx-0x%lx\n", + device_get_nameunit(child), start, end); return (NULL); } if (bootverbose) device_printf(sc->sc_bsc.ops_pcib_sc.dev, "device " - "%s%d requested decoded I/O range 0x%lx-0x%lx\n", - device_get_name(child), device_get_unit(child), - start, end); + "%s requested decoded I/O range 0x%lx-0x%lx\n", + device_get_nameunit(child), start, end); break; case SYS_RES_MEMORY: if (!apb_checkrange(sc->sc_memmap, APB_MEM_SCALE, start, end)) { - device_printf(dev, "device %s%d requested unsupported " + device_printf(dev, "device %s requested unsupported " "memory range 0x%lx-0x%lx\n", - device_get_name(child), device_get_unit(child), - start, end); + device_get_nameunit(child), start, end); return (NULL); } if (bootverbose) device_printf(sc->sc_bsc.ops_pcib_sc.dev, "device " - "%s%d requested decoded memory range 0x%lx-0x%lx\n", - device_get_name(child), device_get_unit(child), - start, end); + "%s requested decoded memory range 0x%lx-0x%lx\n", + device_get_nameunit(child), start, end); break; default: |
