diff --git a/sys/dev/proto/proto_bus_isa.c b/sys/dev/proto/proto_bus_isa.c index 31c65b9d785..7176543345a 100644 --- a/sys/dev/proto/proto_bus_isa.c +++ b/sys/dev/proto/proto_bus_isa.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -63,7 +62,6 @@ static char **proto_isa_devnames; static int proto_isa_probe(device_t dev) { - struct sbuf *sb; struct resource *res; int rid, type; @@ -77,11 +75,7 @@ proto_isa_probe(device_t dev) if (res == NULL) return (ENODEV); - sb = sbuf_new_auto(); - sbuf_printf(sb, "%s:%#jx", proto_isa_prefix, rman_get_start(res)); - sbuf_finish(sb); - device_set_desc_copy(dev, sbuf_data(sb)); - sbuf_delete(sb); + device_set_descf(dev, "%s:%#jx", proto_isa_prefix, rman_get_start(res)); bus_release_resource(dev, type, rid, res); return (proto_probe(dev, proto_isa_prefix, &proto_isa_devnames)); } diff --git a/sys/dev/proto/proto_bus_pci.c b/sys/dev/proto/proto_bus_pci.c index 326f1105f1a..015a2c53d52 100644 --- a/sys/dev/proto/proto_bus_pci.c +++ b/sys/dev/proto/proto_bus_pci.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -63,17 +62,12 @@ static char **proto_pci_devnames; static int proto_pci_probe(device_t dev) { - struct sbuf *sb; - if ((pci_read_config(dev, PCIR_HDRTYPE, 1) & PCIM_HDRTYPE) != 0) return (ENXIO); - sb = sbuf_new_auto(); - sbuf_printf(sb, "%s%d:%d:%d:%d", proto_pci_prefix, pci_get_domain(dev), - pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev)); - sbuf_finish(sb); - device_set_desc_copy(dev, sbuf_data(sb)); - sbuf_delete(sb); + device_set_descf(dev, "%s%d:%d:%d:%d", proto_pci_prefix, + pci_get_domain(dev), pci_get_bus(dev), pci_get_slot(dev), + pci_get_function(dev)); return (proto_probe(dev, proto_pci_prefix, &proto_pci_devnames)); }