Skip to content

Commit 8fd81cd

Browse files
drakedog2008dwsuse
authored andcommitted
mi: Fix C++ compiler errors
C++20 compiler reported the following errors: error: invalid conversion from 'int' to 'nvme_mi_config_smbus_freq' error: designator order for field 'nvme_ns_mgmt_args::nsid' does not match declaration order in 'nvme_ns_mgmt_args' Signed-off-by: Hao Jiang <[email protected]>
1 parent e88d210 commit 8fd81cd

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/nvme/mi.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ static inline int nvme_mi_mi_config_get_smbus_freq(nvme_mi_ep_t ep, __u8 port,
787787

788788
rc = nvme_mi_mi_config_get(ep, dw0, 0, &tmp);
789789
if (!rc)
790-
*freq = tmp & 0x3;
790+
*freq = (enum nvme_mi_config_smbus_freq)(tmp & 0x3);
791791
return rc;
792792
}
793793

@@ -2218,12 +2218,12 @@ static inline int nvme_mi_admin_ns_mgmt_create(nvme_mi_ctrl_t ctrl,
22182218
__u8 csi, __u32 *nsid)
22192219
{
22202220
struct nvme_ns_mgmt_args args = {
2221+
.result = nsid,
2222+
.ns = ns,
22212223
.args_size = sizeof(args),
2222-
.csi = csi,
22232224
.nsid = NVME_NSID_NONE,
22242225
.sel = NVME_NS_MGMT_SEL_CREATE,
2225-
.ns = ns,
2226-
.result = nsid,
2226+
.csi = csi,
22272227
};
22282228

22292229
return nvme_mi_admin_ns_mgmt(ctrl, &args);

0 commit comments

Comments
 (0)