From nobody Thu Jun 27 15:31:05 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 4W92bH070Zz5Ptx8; Thu, 27 Jun 2024 15:31:07 +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 4W92bG07GYz4Brg; Thu, 27 Jun 2024 15:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502266; 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=NSj46aadkt36ZaSCJDokCiUH8/XM4+RZc66TJOT5HBo=; b=fWcp5h3fQoYbDcvxpmu9ZqOXLW4+Ifgb8wIdbHeBPp6w1VWftzpZ5o3UU0uAFJvw9XrW09 ThIopFM+20AWjELCN8mhjElOIKTdSC6eAoDkZJxC/0iHmMnGoRHAeHmf1+SnN2x/SrN06x 6PPbACdmKKVMpZfyUgAnbcS5NJRxCn53I3FLdCmIILVq2lF/UGp8kKT5foHnzupPd1wMLM 2tNMWOBaxe3EtEndsaI3t7BluZwevYf8tv1jF6nnnQoR7s7x4iAwfMZd8ThMcY3GUbk4J/ cF0M09wk4IAAWOpHAtGH7rGl4zeF6ZYXVg4fTVwR4h1PX/kWl526Fyd+zT4kEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502266; a=rsa-sha256; cv=none; b=VYNXH/EcewPMKuS6WD5L7L0hYfiVRq1p7MTjWlIrlXx59kEeF+u5QAhtqcB1M+xSejzh6X w12yBE6S6am8LmLIFUSXSpkC1GgsqrGm1ZFWr6AHjYPev7hGuAIU5RvAa4FFQjck6WIPMK KV2YnQP7lyE0jzyMc8sYBrkjM5gUz6ACvT5v+K3Bpy8f7fmkItqX4dThA3botuMCBcfX2/ NTdMcY0zKSu4tjIX8L7LL2opGDGk3CQhQPy9DXTNW6ulNNWIvWswi7lCv5mHSe7Sd1fa8h jiXaoBKPNEes5JJN8BKJB7AwZIjS7BQtPcd7SySucTyjRJ2Lw0wmR5nUUaWunA== 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=1719502266; 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=NSj46aadkt36ZaSCJDokCiUH8/XM4+RZc66TJOT5HBo=; b=xG78LLfFNPIrGf9NWYATmPOIfstpeUbKvo30XoVSPMZ+ZhPkO4z9Q+HXtac30rJV2ev2V5 tsa4xV1NWiwmlRJ1IZAiMuL7trX/Mp2ZKS9nTMuzstHwtFLLSGLcvws0wJ4SHsFhebaYTQ odr2TREjCIlFdIEO+IKYyFeALvCHKEyt7oxczOL0pJGCOYDUrBTul5XiEIVz0kEC1bBFbJ PlrJfXovsQmFoaMCeK+4G0yqjyR74mbG4xS/N3DWfDL/9LTAHwQ71/sMub5MXWS7pw6ZI5 DeYaJKULL/00eCHXFN3AeXfRtCsW5TiaDp7+JNBFh2zYieYI3vUbeM73qu4Eng== 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 4W92bF6f18zHgX; Thu, 27 Jun 2024 15:31:05 +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 45RFV5Eb078762; Thu, 27 Jun 2024 15:31:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFV5pk078759; Thu, 27 Jun 2024 15:31:05 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:05 GMT Message-Id: <202406271531.45RFV5pk078759@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: 14dbc9a4b4d4 - stable/14 - bce: 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: 14dbc9a4b4d44a1cd8503255a4aa2a99365731fc Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=14dbc9a4b4d44a1cd8503255a4aa2a99365731fc commit 14dbc9a4b4d44a1cd8503255a4aa2a99365731fc Author: Mark Johnston AuthorDate: 2024-06-05 19:22:32 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 bce: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit c0bd6ec3bb2414d23f3013766b79eed51b31f696) --- sys/dev/bce/if_bce.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c index 33158b75486c..2564d0c1dac6 100644 --- a/sys/dev/bce/if_bce.c +++ b/sys/dev/bce/if_bce.c @@ -671,7 +671,6 @@ bce_probe(device_t dev) { const struct bce_type *t; struct bce_softc *sc; - char *descbuf; u16 vid = 0, did = 0, svid = 0, sdid = 0; t = bce_devs; @@ -695,19 +694,10 @@ bce_probe(device_t dev) if ((vid == t->bce_vid) && (did == t->bce_did) && ((svid == t->bce_svid) || (t->bce_svid == PCI_ANY_ID)) && ((sdid == t->bce_sdid) || (t->bce_sdid == PCI_ANY_ID))) { - descbuf = malloc(BCE_DEVDESC_MAX, M_TEMP, M_NOWAIT); - - if (descbuf == NULL) - return(ENOMEM); - - /* Print out the device identity. */ - snprintf(descbuf, BCE_DEVDESC_MAX, "%s (%c%d)", + device_set_descf(dev, "%s (%c%d)", t->bce_name, (((pci_read_config(dev, PCIR_REVID, 4) & 0xf0) >> 4) + 'A'), (pci_read_config(dev, PCIR_REVID, 4) & 0xf)); - - device_set_desc_copy(dev, descbuf); - free(descbuf, M_TEMP); return(BUS_PROBE_DEFAULT); } t++;