From nobody Sun Jun 09 14:12:03 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 4VxxhM6nXHz5MCPX; Sun, 09 Jun 2024 14:12:03 +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 4VxxhM46Ddz4CZ9; Sun, 9 Jun 2024 14:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717942323; 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=qAGMpsncjwXa1VejtoXmrLiOQrAMwVAc1GC6vmTWP3E=; b=A+zplBGDP4gBhUDnzpsNGynUJyl+JQlKQbNASmvTF0QQGMjSy8V14hAGudkBgi1JsOFgaJ yikZgaB1Hw7jusSzdbDYNX1EOBJdPFhKiqPDArFwZWUWWhqcK3pqj0dl/z16+0j7ERg8Ja awSjHh9ppKZu81BERG6rF2jvmGnLssl1QzxVSu6czHGFj5+054uWohJsT13rQpQDo8urZZ 6SVULneyfXU+K4RTPPaMGAvNP7qIf1IdY5VSjqAXbDdId+YGkM5H5cZgc9u9sYWjo813NV Zf+BVE/mOIRbViMyXyCkNTnCo1HSIbJg/tL6EPoqWP7Akwdej6UrJXOqnDvxOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717942323; a=rsa-sha256; cv=none; b=wrZ9PlHT6GrJnfRMyTwCpY76ooFCaDZWG8Kjwbr7VEcakOowru7IeOjdOL5r1qZnWkOKv+ DKI35AKTDDwz9j4F7SCelFehYZvsrNcAKXG1RA3P03E/cnOojykGcmLVcegkYUChZ4qj07 5olo3nNuVO0COps2w/xN6seZpuzz6NKjae532m9UKiV91TBj4tFGgUr5OAv+lPjVhCCre8 COgPykg+c9Jw+a3gN9huKzhObb2g/Ce1wfdZWvRuvOqwo980orLz4uqd1QFW9VGTZ8gstw xJJK+FItxx/+AJ5qFkgXX2JGWR4md45o56k3Xr2+LQ1f/cbbiKzED7nR9tw0LQ== 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=1717942323; 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=qAGMpsncjwXa1VejtoXmrLiOQrAMwVAc1GC6vmTWP3E=; b=VdhlR1Z5prFLA6l227FCT3N+/qlrlXedhXngJvzRtfkj+YA2UrBnwC+wzA+03qY8a5s6WG miY84Bw6eRhdmQrtXxRZp9Mg84lEIWTBJXYVv1aX4s+jMr9HesEIWMUDdHyI/Zg8aU9myB CyMRtXD3EC2y6PYftyzv0Jdfyi4vTAhEozrCvM/g5S7P31NrrCk0cYuKymQrhQZes1Ij63 9FhHvAWRWdLJLHh9ttVpPhYlWq6FToE/PcxVORT3wspC3ayLmfOZeMyI7uAQk2yHmZww0g pfF5hiI+wCrpNzZWKE/wn4HNLQ/R/rpsR998kqpidUKYNMyJ7gN4ehj0BjIw5A== 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 4VxxhM3kTkzlPF; Sun, 9 Jun 2024 14:12:03 +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 459EC3Xv085557; Sun, 9 Jun 2024 14:12:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 459EC3vQ085554; Sun, 9 Jun 2024 14:12:03 GMT (envelope-from git) Date: Sun, 9 Jun 2024 14:12:03 GMT Message-Id: <202406091412.459EC3vQ085554@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: 18468b225ce4 - stable/14 - bhnd: Use device_set_descf() 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: 18468b225ce45a97a4c7ea70e7741fc8022b0b3a Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=18468b225ce45a97a4c7ea70e7741fc8022b0b3a commit 18468b225ce45a97a4c7ea70e7741fc8022b0b3a Author: Mark Johnston AuthorDate: 2024-02-04 23:35:02 +0000 Commit: Mark Johnston CommitDate: 2024-06-09 13:37:49 +0000 bhnd: Use device_set_descf() Here we are in a device probe routine with no locks held. M_WAITOK allocations are ok. No functional change intended. MFC after: 1 week (cherry picked from commit a866a40b9b8095a1a31eb22d575535c1f5fbc080) --- sys/dev/bhnd/bhnd_subr.c | 20 ++------------------ sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c | 4 +--- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/sys/dev/bhnd/bhnd_subr.c b/sys/dev/bhnd/bhnd_subr.c index df2474f57659..c29122c38759 100644 --- a/sys/dev/bhnd/bhnd_subr.c +++ b/sys/dev/bhnd/bhnd_subr.c @@ -1766,18 +1766,10 @@ void bhnd_set_custom_core_desc(device_t dev, const char *dev_name) { const char *vendor_name; - char *desc; vendor_name = bhnd_get_vendor_name(dev); - asprintf(&desc, M_BHND, "%s %s, rev %hhu", vendor_name, dev_name, + device_set_descf(dev, "%s %s, rev %hhu", vendor_name, dev_name, bhnd_get_hwrev(dev)); - - if (desc != NULL) { - device_set_desc_copy(dev, desc); - free(desc, M_BHND); - } else { - device_set_desc(dev, dev_name); - } } /** @@ -1803,7 +1795,6 @@ void bhnd_set_default_bus_desc(device_t dev, const struct bhnd_chipid *chip_id) { const char *bus_name; - char *desc; char chip_name[BHND_CHIPID_MAX_NAMELEN]; /* Determine chip type's bus name */ @@ -1828,14 +1819,7 @@ bhnd_set_default_bus_desc(device_t dev, const struct bhnd_chipid *chip_id) chip_id->chip_id); /* Format and set device description */ - asprintf(&desc, M_BHND, "%s %s", chip_name, bus_name); - if (desc != NULL) { - device_set_desc_copy(dev, desc); - free(desc, M_BHND); - } else { - device_set_desc(dev, bus_name); - } - + device_set_descf(dev, "%s %s", chip_name, bus_name); } /** diff --git a/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c b/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c index 95b19d973e26..ce50fcd0ee1f 100644 --- a/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c +++ b/sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c @@ -62,7 +62,6 @@ bhnd_pmu_chipc_probe(device_t dev) struct chipc_caps *ccaps; struct chipc_softc *chipc_sc; device_t chipc; - char desc[34]; int error; uint32_t pcaps; uint8_t rev; @@ -87,8 +86,7 @@ bhnd_pmu_chipc_probe(device_t dev) /* Set description */ rev = BHND_PMU_GET_BITS(pcaps, BHND_PMU_CAP_REV); - snprintf(desc, sizeof(desc), "Broadcom ChipCommon PMU, rev %hhu", rev); - device_set_desc_copy(dev, desc); + device_set_descf(dev, "Broadcom ChipCommon PMU, rev %hhu", rev); return (BUS_PROBE_NOWILDCARD); }