From nobody Thu Jun 27 15:31:11 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 4W92bN0K1Sz5Pttr; Thu, 27 Jun 2024 15:31:12 +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 4W92bM5Dfbz4CRp; Thu, 27 Jun 2024 15:31:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719502271; 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=bXwV8x7w/ZLE0c9rTNwKsAkq0+JZaW9dBzF0SksIgd8=; b=Z/tlycQoVQxMMF5H4c7e4Dh4xmdUg662/YmMCtrsndOstXie0yWpXfEia9bU1FA4/pMYkd G+D7iaooQPww2+P7xoZQy/U1KZHueutKNUMMFeS4vku8vMJj0+VxrnO3AVpNWtDEAZowxJ cNmTuiXzkBQ9jcZz5GJeKRp5ORiUgHA6Z1taDNoFWhJqIk4mcxR5qRvDr/m2YZHOCM/IWW Af+RsSusHTltS4M32QIDZqsmwQfLyrvJQgQiELcutT4QnMGLeoESYJSyH1KVvXBL4iILC0 n5FJKTAnV71pnvKnaFy5gLBUZCD47HK9MZygm3Q1HP0J3wwDjr0Of5/wmQzpIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719502271; a=rsa-sha256; cv=none; b=VfEuAfdHmgkanzzz8k9xeKg2EELMFVmgh85wf3LzUFR2MaCisNc6frPIfZyesaQpVOtXNa ErQryyxjMyAW4EzK9MPtvsfYFR4DYQlWz0a983Als/EmnrDZgBBNGUPjAFoDC+iI4LNpwf Pt+wxN6BgXBZBkjXjf5bV+Vgwhx0gZPlxymqejrWFMno2zfgCLKjbXIcrfzLG+nDciRwvW kmM+MONo7yVJseDYTBl9OBrvw8yZppb5QOah/Oj9kFNVDUExCxYnN5Qyn4JxStyr5yncIh 3QG+uG5TPil6zC5fDGE1l4yxE9PYiXTJvfWJ6qbRU9/e0Hn4dpJxVwJwbqaTbg== 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=1719502271; 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=bXwV8x7w/ZLE0c9rTNwKsAkq0+JZaW9dBzF0SksIgd8=; b=ccuH5HWo67ne8V7uUQ8sdxgRufz5rwDib7QL2bbtEzUs7Lu/s1xIPHVW8rVOUblI5DUDTm JgGwv05G/aVGxDENptqzR3wzXEOATtl0xsHSGPw67AEJ4fPyxnyDP92Rs0o+qSHZQGE/bl BsPHQnkdzJNQVV9MzJD8E5JfyvSlw7Guu4zdnNofN/v5uIJp04MQhKVyNMB6+nKLV+JnOF T+7vyDYE0ZfqTeom5/usKza1hU/a8zbzv06A/Owz8SxiHdHE6H03LiG4703PCtURgHl54x 5GQqvY8a0n0VAVIDIz5TeEGT5kJStfMblPeBYSbdFAygdUfEMf9hudV5urYLQA== 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 4W92bM4rlwzHgZ; Thu, 27 Jun 2024 15:31:11 +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 45RFVB2C078950; Thu, 27 Jun 2024 15:31:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RFVBoG078947; Thu, 27 Jun 2024 15:31:11 GMT (envelope-from git) Date: Thu, 27 Jun 2024 15:31:11 GMT Message-Id: <202406271531.45RFVBoG078947@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: c07458f1931e - stable/14 - cfi: 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: c07458f1931e27846cf260d5f0552149878a1cf1 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c07458f1931e27846cf260d5f0552149878a1cf1 commit c07458f1931e27846cf260d5f0552149878a1cf1 Author: Mark Johnston AuthorDate: 2024-06-05 19:26:50 +0000 Commit: Mark Johnston CommitDate: 2024-06-27 15:27:41 +0000 cfi: Use device_set_descf() No functional change intended. MFC after: 1 week (cherry picked from commit 2ef1f61df2d5961ffff1205d4800e46efadbf5ba) --- sys/dev/cfi/cfi_core.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/dev/cfi/cfi_core.c b/sys/dev/cfi/cfi_core.c index 4e137140372c..9554a710d8f2 100644 --- a/sys/dev/cfi/cfi_core.c +++ b/sys/dev/cfi/cfi_core.c @@ -194,7 +194,6 @@ cfi_fmtsize(uint32_t sz) int cfi_probe(device_t dev) { - char desc[80]; struct cfi_softc *sc; char *vend_str; int error; @@ -279,9 +278,7 @@ cfi_probe(device_t dev) if (error) goto out; - snprintf(desc, sizeof(desc), "%s - %s", vend_str, - cfi_fmtsize(sc->sc_size)); - device_set_desc_copy(dev, desc); + device_set_descf(dev, "%s - %s", vend_str, cfi_fmtsize(sc->sc_size)); out: bus_release_resource(dev, SYS_RES_MEMORY, sc->sc_rid, sc->sc_res);