upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-02-18 18:20:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

proto: Use device_set_descf()

Browse source 
No functional change intended.

MFC after:	1 week

(cherry picked from commit 542f9494b747079b13f3ed672cd01fa902e98ff2)
This commit is contained in:
Mark Johnston 2024-02-04 18:58:30 -05:00
parent d73f9fc264
commit 3f6fc84ad9
2 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys/dev/proto/proto_bus_isa.c
View file

@ -33,7 +33,6 @@
#include <machine/bus.h>
#include <sys/rman.h>
#include <machine/resource.h>
#include <sys/sbuf.h>
#include <isa/isavar.h>
#include <isa/pnpvar.h>
@ -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));
}

12
sys/dev/proto/proto_bus_pci.c
View file

@ -33,7 +33,6 @@
#include <machine/bus.h>
#include <sys/rman.h>
#include <machine/resource.h>
#include <sys/sbuf.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
@ -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));
}