From nobody Sun Jun 02 23:47:18 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 4VstnM3klRz5LVY3; Sun, 02 Jun 2024 23:47:19 +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 4VstnM0c9Mz49wg; Sun, 2 Jun 2024 23:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717372039; 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=juX78QiyXjDZ+orMvDrJLqnUbyd2UavMUvwkPM4sjXQ=; b=qiNLb+xw4CPf7I4ocGeDhOKTSz6ARBIOWGTdRrVsW1lgW5pnku1p6ypLAFPPs03dVz3x12 3ConBPf1BEv4GRWolSA+xYRZA66GFc0DPRy27BM/QWMlosvZ72Aq90NrM3gHOo4VZNqU1/ aw6o5CwvQ1R220kQtpRA7DCPD0G2Q0yvbKnU3eS07f0cGuc0it4VAO2V4EI9IZOxZF0Okd kZ5iI/eFDvpXVw4j97znixkb/N+QZCtdnkJZcuN/Q/lIdxtuz/Om6Wp5qdW2FfV/jCCHlU xCJntm9PdA3w0QKCyKAIaGRRvhJzNAJNdnaPs9KLPyioDANOgrnjdyoPrs/saQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717372039; a=rsa-sha256; cv=none; b=oS4kIm+vo72kpaajV7bK+BaD18LdcjHByZ/+SfSX1GLHBxFh3PMYvZ/3Pvlux5SfeDpVWM txSgBRWrYwEFP8n5mqzyLzO58Q3uGEXqne/NbTLuNRlOu9rgI8bp5lhLW5hkFx5i21GKLA c6tbq5jDETuVA+UgYLs32YwuqSnXBOfuXjVujSgjcquo8GwreeoGdCRTwyHUF9zq/fuhZL fvmjwG0POQeMjZXhpoZBsoGfAHry5yR5R6wXOqjqs9qqjxOfQ1q/9wHml8NWpWLTEq9Y8Y O9NAnOwItm9iPazztOUoHnup6qGTFuL9QIo3sYePiV5ALZRTl51x7MA4c2Ejsw== 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=1717372039; 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=juX78QiyXjDZ+orMvDrJLqnUbyd2UavMUvwkPM4sjXQ=; b=vIbzW7mgGA59tGYmLtwuwB2DsfpzarAgYQa2c3Ipec12ELHyTN1jm2OEOKx/v3aeKUIV4f 6Vly8chIDjhLvPg4vnMf5BvAQ1L/M3HKp9IhIMlKlufukisiakxdOry/AiY1kg7/KwuHK8 KxaSYwbxyctQLMLxJbsuvsSmNLVZmFHHk43D68vROJzA6e8la7qN6PQAbzUG3aBs92iNcb VCgRlCOBrhJ88FxRi/XQOrsBgr9gVln2pJUH5EK0b6ygfLEA1XNgUeJyBwHgcNe0JPvE+x hzCKwdCBAs7ncYfRkV1buPcoozj2xNZcHdgXpXaVn2ji+G5sEZkNTi7YdoyEIg== 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 4VstnM09FWz1BlJ; Sun, 2 Jun 2024 23:47:19 +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 452NlIVZ056663; Sun, 2 Jun 2024 23:47:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 452NlIPw056660; Sun, 2 Jun 2024 23:47:18 GMT (envelope-from git) Date: Sun, 2 Jun 2024 23:47:18 GMT Message-Id: <202406022347.452NlIPw056660@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: 17bfbc400f53 - main - siis: 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/main X-Git-Reftype: branch X-Git-Commit: 17bfbc400f53ff1768c907b35c9cf045d540b8ab Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=17bfbc400f53ff1768c907b35c9cf045d540b8ab commit 17bfbc400f53ff1768c907b35c9cf045d540b8ab Author: Mark Johnston AuthorDate: 2024-02-04 23:44:11 +0000 Commit: Mark Johnston CommitDate: 2024-06-02 23:38:41 +0000 siis: Use device_set_desc(f)() No functional change intended. MFC after: 1 week --- sys/dev/siis/siis.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c index 54ef7ff440aa..ad370c99f85e 100644 --- a/sys/dev/siis/siis.c +++ b/sys/dev/siis/siis.c @@ -120,15 +120,13 @@ static struct { static int siis_probe(device_t dev) { - char buf[64]; int i; uint32_t devid = pci_get_devid(dev); for (i = 0; siis_ids[i].id != 0; i++) { if (siis_ids[i].id == devid) { - snprintf(buf, sizeof(buf), "%s SATA controller", + device_set_descf(dev, "%s SATA controller", siis_ids[i].name); - device_set_desc_copy(dev, buf); return (BUS_PROBE_DEFAULT); } } @@ -449,7 +447,7 @@ static int siis_ch_probe(device_t dev) { - device_set_desc_copy(dev, "SIIS channel"); + device_set_desc(dev, "SIIS channel"); return (BUS_PROBE_DEFAULT); }