From nobody Sun Jun 09 14:12:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VxxhJ21c3z5MCHD; Sun, 09 Jun 2024 14:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VxxhJ1Y6zz4CgK; Sun, 9 Jun 2024 14:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717942320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uwLRJOSyeRfEbRTXxEEDnC4PGiPDOsugyo1JNfYuUO0=; b=xiJ5YrF1UcVdGUAFqJ+KQbn/VkN7ucFqDLHrioNtlkfmY+xhdlEPnWDaV+hBwWSFWWm8KL oaO5KdSetLM60yiQIwOyw57n0oZVQ9YnRmfs5nHHKWsPO8vP6JeaaeGMfLkTcwZJhmyLfh A9Gb5zp538JGKxauRAq6VGeqcNQJwU7Daa9n/cG8nZTwE9k+Kulst9WI5eDAc6BA5AbXdd 5Z8CIdZ3dPF04UA7CBvPOCV2Kc9JGjb1G3MLve+VqcR2pluKHQDLZzBzMPMuU22keQTm+O seVk4wISN1QzDWAf8KYFlAPU7H0VeQRXsi0dqXL/KkZ7wVg29JGh8QZkn1yVOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717942320; a=rsa-sha256; cv=none; b=qzE7gtOyywh3mbTH2DLdkSpQC8B4VUJ31/klI3XFFwx9olT3Q8Q5uSfq/OD2Ws2UxAiuIp tsYru0PTZ7SW5TkXSlGLBpg3FgTriZeFiWmvAsZZPs7KdRqe7PmOp2OPOUI3PUPswZJfly 9aPJ76eBlNLbNBdV12QyHYMNLllpPCaDEACcF10DynpIL+hTFUU/fhCkpbfD++96yKN4Rm Rai4SqYyQNVxd1cf4+3/LTG3FrfyLbF/fQgEgiGAJLLJOo4P4l85rXW8mkGmDTAXrr7jKm cHozU+FFfImm27+a3rzSRmbUNPH79eS/OYorAz6ImBpx/hQg0cmHu74gqBqozw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717942320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uwLRJOSyeRfEbRTXxEEDnC4PGiPDOsugyo1JNfYuUO0=; b=oRaGGd1Um4sIiqduDKGvBdggBVmbRbi5O/J8V5lNBCc5+tjMI1AB09SMFegOLF0edXkk4R p3QqnFRNgJrFD+FCMgdEaYtAA1yj4X0ogeQp2jJ2qKGcVIXo4aK10r1lrnl+S+v8j1zD2m ZvcLNOdWVpx6ORGt7JtNRn1NsYmLYGv8AmJdOrCmbMGLj5qfk4OG+v5/UhjVCWw56Rm5Y2 X+bxyObJgEkWtR5QtuWQenxz5NoTbp7LrG9NAO8iYlsXn91wTQ8LT8kGzSufWotdT0QHVt G1TVY0HCRokPXH1bzcVh/C8MaA5swd96n+xCygI2vzss+8aqZBO3liNIRxonUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VxxhJ18VXzljj; Sun, 9 Jun 2024 14:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 459EC0Jc085444; Sun, 9 Jun 2024 14:12:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 459EC0uZ085441; Sun, 9 Jun 2024 14:12:00 GMT (envelope-from git) Date: Sun, 9 Jun 2024 14:12:00 GMT Message-Id: <202406091412.459EC0uZ085441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: ad0f458adece - stable/14 - arm: Convert drivers to use device_set_desc(f)() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ad0f458adece02aa026a3df6e22f8e04ec07fe95 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ad0f458adece02aa026a3df6e22f8e04ec07fe95 commit ad0f458adece02aa026a3df6e22f8e04ec07fe95 Author: Mark Johnston AuthorDate: 2024-02-04 23:23:00 +0000 Commit: Mark Johnston CommitDate: 2024-06-09 13:37:45 +0000 arm: Convert drivers to use device_set_desc(f)() No functional change intended. MFC after: 1 week (cherry picked from commit 459dc61c8b05dedb61a2774348ffda7d7f8ea7c6) --- 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 4f44a09b4a76..b2ca1f9e496b 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 e576a11fe70e..341ec07466fc 100644 --- a/sys/arm/ti/am335x/am335x_dmtimer.c +++ b/sys/arm/ti/am335x/am335x_dmtimer.c @@ -249,7 +249,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; @@ -277,8 +276,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 23b930741c2a..3cda880431ff 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); }