From dbdd27ff47fb84c665ca1af6d6385f578af06d51 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Wed, 2 Feb 2022 10:45:10 -0700 Subject: [PATCH] idxd: Rename idxd_cmdsts_reg to idxd_cmdsts_register All of the other structs and unions spell out register, so match the style. Change-Id: Ie502e80206305037d1518a1db590d89b7479abb4 Signed-off-by: Ben Walker Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11433 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Paul Luse Reviewed-by: Changpeng Liu Reviewed-by: Aleksey Marchuk --- include/spdk/idxd_spec.h | 4 ++-- lib/idxd/idxd_user.c | 2 +- test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/spdk/idxd_spec.h b/include/spdk/idxd_spec.h index a4038a14f8..ec478eb2a0 100644 --- a/include/spdk/idxd_spec.h +++ b/include/spdk/idxd_spec.h @@ -399,7 +399,7 @@ union idxd_gensts_register { }; SPDK_STATIC_ASSERT(sizeof(union idxd_gensts_register) == 4, "size mismatch"); -union idxd_cmdsts_reg { +union idxd_cmdsts_register { struct { uint32_t err : 8; uint32_t result : 16; @@ -408,7 +408,7 @@ union idxd_cmdsts_reg { }; uint32_t raw; }; -SPDK_STATIC_ASSERT(sizeof(union idxd_cmdsts_reg) == 4, "size mismatch"); +SPDK_STATIC_ASSERT(sizeof(union idxd_cmdsts_register) == 4, "size mismatch"); union idxd_swerr_register { struct { diff --git a/lib/idxd/idxd_user.c b/lib/idxd/idxd_user.c index 0f477f7cd1..92c9451731 100644 --- a/lib/idxd/idxd_user.c +++ b/lib/idxd/idxd_user.c @@ -109,7 +109,7 @@ static int idxd_wait_cmd(struct spdk_idxd_device *idxd, int _timeout) { uint32_t timeout = _timeout; - union idxd_cmdsts_reg cmd_status = {}; + union idxd_cmdsts_register cmd_status = {}; cmd_status.raw = _idxd_read_4(idxd, IDXD_CMDSTS_OFFSET); while (cmd_status.active && --timeout) { diff --git a/test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c b/test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c index d2b2bafec1..c77bc89b49 100644 --- a/test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c +++ b/test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c @@ -200,7 +200,7 @@ static int test_idxd_reset_dev(void) { struct spdk_user_idxd_device user_idxd = {}; - union idxd_cmdsts_reg *fake_cmd_status_reg; + union idxd_cmdsts_register *fake_cmd_status_reg; int rc; user_idxd.reg_base = calloc(1, FAKE_REG_SIZE); @@ -226,7 +226,7 @@ test_idxd_wait_cmd(void) { struct spdk_user_idxd_device user_idxd = {}; int timeout = 1; - union idxd_cmdsts_reg *fake_cmd_status_reg; + union idxd_cmdsts_register *fake_cmd_status_reg; int rc; user_idxd.reg_base = calloc(1, FAKE_REG_SIZE);