Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 Jun 2024 23:47:10 GMT
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 459dc61c8b05 - main - arm: Convert drivers to use device_set_desc(f)()
Message-ID:  <202406022347.452NlAgX056395@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=459dc61c8b05dedb61a2774348ffda7d7f8ea7c6

commit 459dc61c8b05dedb61a2774348ffda7d7f8ea7c6
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-02-04 23:23:00 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-06-02 23:38:40 +0000

    arm: Convert drivers to use device_set_desc(f)()
    
    No functional change intended.
    
    MFC after:      1 week
---
 sys/arm/nvidia/tegra_ahci.c        | 2 +-
 sys/arm/ti/am335x/am335x_dmtimer.c | 4 +---
 sys/arm/ti/am335x/am335x_dmtpps.c  | 5 +----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/sys/arm/nvidia/tegra_ahci.c b/sys/arm/nvidia/tegra_ahci.c
index c5d4dbff977c..30e28dd33235 100644
--- a/sys/arm/nvidia/tegra_ahci.c
+++ b/sys/arm/nvidia/tegra_ahci.c
@@ -651,7 +651,7 @@ tegra_ahci_probe(device_t dev)
 	if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data)
 		return (ENXIO);
 
-	device_set_desc_copy(dev, "AHCI SATA controller");
+	device_set_desc(dev, "AHCI SATA controller");
 	return (BUS_PROBE_DEFAULT);
 }
 
diff --git a/sys/arm/ti/am335x/am335x_dmtimer.c b/sys/arm/ti/am335x/am335x_dmtimer.c
index a4ca188bd83b..fde5f04875cc 100644
--- a/sys/arm/ti/am335x/am335x_dmtimer.c
+++ b/sys/arm/ti/am335x/am335x_dmtimer.c
@@ -248,7 +248,6 @@ am335x_dmtimer_tc_init(struct am335x_dmtimer_softc *sc)
 static int
 am335x_dmtimer_probe(device_t dev)
 {
-	char strbuf[32];
 	int tmr_num;
 	uint64_t rev_address;
 
@@ -276,8 +275,7 @@ am335x_dmtimer_probe(device_t dev)
 			return (ENXIO);
 	}
 
-	snprintf(strbuf, sizeof(strbuf), "AM335x DMTimer%d", tmr_num);
-	device_set_desc_copy(dev, strbuf);
+	device_set_descf("AM335x DMTimer%d", tmr_num);
 
 	return(BUS_PROBE_DEFAULT);
 }
diff --git a/sys/arm/ti/am335x/am335x_dmtpps.c b/sys/arm/ti/am335x/am335x_dmtpps.c
index f3e4386e4837..5a19d3ad0dc3 100644
--- a/sys/arm/ti/am335x/am335x_dmtpps.c
+++ b/sys/arm/ti/am335x/am335x_dmtpps.c
@@ -383,7 +383,6 @@ static struct cdevsw dmtpps_cdevsw = {
 static int
 dmtpps_probe(device_t dev)
 {
-	char strbuf[64];
 	int tmr_num;
 	uint64_t rev_address;
 
@@ -435,9 +434,7 @@ dmtpps_probe(device_t dev)
 	if (dmtpps_tmr_num != tmr_num)
 		return (ENXIO);
 
-	snprintf(strbuf, sizeof(strbuf), "AM335x PPS-Capture DMTimer%d",
-	    tmr_num);
-	device_set_desc_copy(dev, strbuf);
+	device_set_descf("AM335x PPS-Capture DMTimer%d", tmr_num);
 
 	return(BUS_PROBE_DEFAULT);
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406022347.452NlAgX056395>