From nobody Sun Jun 16 20:38: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 4W2PwW73Y6z5PR2G; Sun, 16 Jun 2024 20:38: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 4W2PwW4st6z3xRh; Sun, 16 Jun 2024 20:38:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570283; 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=9J4sFVksSdqHK29DVLFqEszfxHtqJ7Bd2dAj6Gbyphs=; b=KC5wAcaGOtwiHRt2nMH7clltZpSNoGvgN+i2ba4gs1/VCwNlIKfUvVisNj76xXwMyRRldy js0EWsd1/pzODJwYKAoBwEiWbNMfTMglIS17Jm7uocKt3PA3J9UOru2WBy+Hd/XW0ofVw4 /+7OP6CFPfRNxl8X6zVmIoInNIjv5jEPNHAYVhyQ6LeEIb3rydykYT3k5V7TtwbG1tx+WG VJJ0egbYnDIoEcpoxQdRI/f1eoAc9PTa2heho9ypehcGrtOdf7PNztfwhm5ois/MboueUm jWqFf/8p2riiOvs7Iddbf1MQPjiPhMVAXbr6R1Kyx2Jv3kBcpvCkqgC7CnxadQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570283; a=rsa-sha256; cv=none; b=bXzKy1BhHrjr5qSDk2OboBI5ZsjkC9gkfAGOovIqvI/x7UCGsCnawZvoeKpG6Mxiyj9hPO 7Bx3beKrr598zB8ELuDxb4pPRUmIkh2r5m7RqlB0L25x+vCKpKokZrpCPlbRhEoYIgAbuT 4KQHOsU0C+oPjefAF2sswbVBHzFMiKqAafkkABkKTFaD2AqQKs0V4iCzHIpZ9MXKla7lza OPrDizWklJTsyxL7ff/uO9fT5rWDpOTKlNTHkOK7+YLz/M/U/ONdqzcg6uN7fCY346P7JZ FGcHVD3yTwvETuniY/5n/zL9IcRlMI7WjwI6DZ7E0S/tA9Qm2iYYNj7Qf6ZNxg== 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=1718570283; 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=9J4sFVksSdqHK29DVLFqEszfxHtqJ7Bd2dAj6Gbyphs=; b=rSRHDK9u6zrH8c0xAtoIDR9mbeacdnCaXNG98HschxQq9dsK1ljkFyu5eRrlNSBqCCp0WW kvGACylRNQf45GMF31HEmywKEVZqlu2wXfauhujcRBCvWhn4FTcRybzmM2FxNnrQROkb6R QCeqJK9eD9Fdz7nqxI77m+u+fMBVtFNNoN6hDiaSqhwj1T0eDyMQ4VF8RlYtns/3BazNSQ gbdw7v706IubsVeSLnolee+a6CE8pBfJMARPiS4oudgFgjecdLEkh/fTk3iaY42pF30fEk SDXaAzTUFwdgJdjMnG+s1CSiF1RU8vW55O6FDeW65AOy+9Zl+jpNmr0GwJgUEg== 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 4W2PwW4Qqmz12KV; Sun, 16 Jun 2024 20:38: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 45GKc3hA079728; Sun, 16 Jun 2024 20:38:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKc3cL079725; Sun, 16 Jun 2024 20:38:03 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:38:03 GMT Message-Id: <202406162038.45GKc3cL079725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2ef1f61df2d5 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 2ef1f61df2d5961ffff1205d4800e46efadbf5ba Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2ef1f61df2d5961ffff1205d4800e46efadbf5ba commit 2ef1f61df2d5961ffff1205d4800e46efadbf5ba Author: Mark Johnston AuthorDate: 2024-06-05 19:26:50 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 cfi: Use device_set_descf() No functional change intended. MFC after: 1 week --- 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);