From owner-dev-commits-src-main@freebsd.org Fri Jul 2 22:05:37 2021
Return-Path: <owner-dev-commits-src-main@freebsd.org>
Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0499867358E;
Fri, 2 Jul 2021 22:05:37 +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 4GGq006X6Kz4VQt;
Fri, 2 Jul 2021 22:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org)
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 BB2D51BDD8;
Fri, 2 Jul 2021 22:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 162M5aR4010231;
Fri, 2 Jul 2021 22:05:36 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 162M5aRk010230;
Fri, 2 Jul 2021 22:05:36 GMT (envelope-from git)
Date: Fri, 2 Jul 2021 22:05:36 GMT
Message-Id: <202107022205.162M5aRk010230@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Warner Losh <imp@FreeBSD.org>
Subject: git: 80a75155e160 - main - nvme: style nit
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: imp
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 80a75155e1601bddc2c595c06ab6ea916c603071
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-main@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for the main branch of the src repository
<dev-commits-src-main.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-main/>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Help: <mailto:dev-commits-src-main-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main>,
<mailto:dev-commits-src-main-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jul 2021 22:05:37 -0000
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=80a75155e1601bddc2c595c06ab6ea916c603071
commit 80a75155e1601bddc2c595c06ab6ea916c603071
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2021-07-02 21:58:14 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2021-07-02 22:05:19 +0000
nvme: style nit
Put the { on the same line as the struct nvme_foo when we define these
structures. It's FreeBSD standard and these were inconsistent.
Sponsored by: Netflix
---
sys/dev/nvme/nvme.h | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h
index b28a8d4348db..d63a074f321d 100644
--- a/sys/dev/nvme/nvme.h
+++ b/sys/dev/nvme/nvme.h
@@ -546,8 +546,7 @@ enum shst_value {
NVME_SHST_COMPLETE = 0x2,
};
-struct nvme_registers
-{
+struct nvme_registers {
uint32_t cap_lo; /* controller capabilities */
uint32_t cap_hi;
uint32_t vs; /* version */
@@ -584,8 +583,7 @@ struct nvme_registers
_Static_assert(sizeof(struct nvme_registers) == 0x1008, "bad size for nvme_registers");
-struct nvme_command
-{
+struct nvme_command {
/* dword 0 */
uint8_t opc; /* opcode */
uint8_t fuse; /* fused operation */
@@ -1446,8 +1444,7 @@ struct nvme_sanitize_status_page {
_Static_assert(sizeof(struct nvme_sanitize_status_page) == 512,
"bad size for nvme_sanitize_status_page");
-struct intel_log_temp_stats
-{
+struct intel_log_temp_stats {
uint64_t current;
uint64_t overtemp_flag_last;
uint64_t overtemp_flag_life;
@@ -1461,8 +1458,7 @@ struct intel_log_temp_stats
_Static_assert(sizeof(struct intel_log_temp_stats) == 13 * 8, "bad size for intel_log_temp_stats");
-struct nvme_resv_reg_ctrlr
-{
+struct nvme_resv_reg_ctrlr {
uint16_t ctrlr_id; /* Controller ID */
uint8_t rcsts; /* Reservation Status */
uint8_t reserved3[5];
@@ -1472,8 +1468,7 @@ struct nvme_resv_reg_ctrlr
_Static_assert(sizeof(struct nvme_resv_reg_ctrlr) == 24, "bad size for nvme_resv_reg_ctrlr");
-struct nvme_resv_reg_ctrlr_ext
-{
+struct nvme_resv_reg_ctrlr_ext {
uint16_t ctrlr_id; /* Controller ID */
uint8_t rcsts; /* Reservation Status */
uint8_t reserved3[5];
@@ -1484,8 +1479,7 @@ struct nvme_resv_reg_ctrlr_ext
_Static_assert(sizeof(struct nvme_resv_reg_ctrlr_ext) == 64, "bad size for nvme_resv_reg_ctrlr_ext");
-struct nvme_resv_status
-{
+struct nvme_resv_status {
uint32_t gen; /* Generation */
uint8_t rtype; /* Reservation Type */
uint8_t regctl[2]; /* Number of Registered Controllers */
@@ -1497,8 +1491,7 @@ struct nvme_resv_status
_Static_assert(sizeof(struct nvme_resv_status) == 24, "bad size for nvme_resv_status");
-struct nvme_resv_status_ext
-{
+struct nvme_resv_status_ext {
uint32_t gen; /* Generation */
uint8_t rtype; /* Reservation Type */
uint8_t regctl[2]; /* Number of Registered Controllers */