The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=de140d60d5282b0dbf79979d04d5b6b11511e25d
commit de140d60d5282b0dbf79979d04d5b6b11511e25d Author: Mark Johnston <ma...@freebsd.org> AuthorDate: 2024-02-04 23:52:23 +0000 Commit: Mark Johnston <ma...@freebsd.org> CommitDate: 2024-06-02 23:38:41 +0000 virtio: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/virtio/pci/virtio_pci_legacy.c | 4 +--- sys/dev/virtio/pci/virtio_pci_modern.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/dev/virtio/pci/virtio_pci_legacy.c b/sys/dev/virtio/pci/virtio_pci_legacy.c index 238434c350fb..18dbb00e0d8c 100644 --- a/sys/dev/virtio/pci/virtio_pci_legacy.c +++ b/sys/dev/virtio/pci/virtio_pci_legacy.c @@ -190,7 +190,6 @@ DRIVER_MODULE(virtio_pci_legacy, pci, vtpci_legacy_driver, 0, 0); static int vtpci_legacy_probe(device_t dev) { - char desc[64]; const char *name; if (pci_get_vendor(dev) != VIRTIO_PCI_VENDORID) @@ -207,8 +206,7 @@ vtpci_legacy_probe(device_t dev) if (name == NULL) name = "Unknown"; - snprintf(desc, sizeof(desc), "VirtIO PCI (legacy) %s adapter", name); - device_set_desc_copy(dev, desc); + device_set_descf(dev, "VirtIO PCI (legacy) %s adapter", name); /* Prefer transitional modern VirtIO PCI. */ return (BUS_PROBE_LOW_PRIORITY); diff --git a/sys/dev/virtio/pci/virtio_pci_modern.c b/sys/dev/virtio/pci/virtio_pci_modern.c index 8f9b1f21aeab..eb1d5a1e6989 100644 --- a/sys/dev/virtio/pci/virtio_pci_modern.c +++ b/sys/dev/virtio/pci/virtio_pci_modern.c @@ -244,7 +244,6 @@ DRIVER_MODULE(virtio_pci_modern, pci, vtpci_modern_driver, 0, 0); static int vtpci_modern_probe(device_t dev) { - char desc[64]; const char *name; uint16_t devid; @@ -269,8 +268,7 @@ vtpci_modern_probe(device_t dev) if (name == NULL) name = "Unknown"; - snprintf(desc, sizeof(desc), "VirtIO PCI (modern) %s adapter", name); - device_set_desc_copy(dev, desc); + device_set_descf(dev, "VirtIO PCI (modern) %s adapter", name); return (BUS_PROBE_DEFAULT); }