[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/14] hw/block/nvme: rename __nvme_zrm_open
From: |
Klaus Jensen |
Subject: |
[PATCH 01/14] hw/block/nvme: rename __nvme_zrm_open |
Date: |
Mon, 19 Apr 2021 21:27:48 +0200 |
From: Klaus Jensen <k.jensen@samsung.com>
Get rid of the (reserved) double underscore use.
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
hw/block/nvme.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 624a1431d072..002c0672b397 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -1682,8 +1682,12 @@ static void nvme_zrm_auto_transition_zone(NvmeNamespace
*ns)
}
}
-static uint16_t __nvme_zrm_open(NvmeNamespace *ns, NvmeZone *zone,
- bool implicit)
+enum {
+ NVME_ZRM_AUTO = 1 << 0,
+};
+
+static uint16_t nvme_zrm_open_flags(NvmeNamespace *ns, NvmeZone *zone,
+ int flags)
{
int act = 0;
uint16_t status;
@@ -1707,7 +1711,7 @@ static uint16_t __nvme_zrm_open(NvmeNamespace *ns,
NvmeZone *zone,
nvme_aor_inc_open(ns);
- if (implicit) {
+ if (flags & NVME_ZRM_AUTO) {
nvme_assign_zone_state(ns, zone, NVME_ZONE_STATE_IMPLICITLY_OPEN);
return NVME_SUCCESS;
}
@@ -1715,7 +1719,7 @@ static uint16_t __nvme_zrm_open(NvmeNamespace *ns,
NvmeZone *zone,
/* fallthrough */
case NVME_ZONE_STATE_IMPLICITLY_OPEN:
- if (implicit) {
+ if (flags & NVME_ZRM_AUTO) {
return NVME_SUCCESS;
}
@@ -1733,12 +1737,12 @@ static uint16_t __nvme_zrm_open(NvmeNamespace *ns,
NvmeZone *zone,
static inline uint16_t nvme_zrm_auto(NvmeNamespace *ns, NvmeZone *zone)
{
- return __nvme_zrm_open(ns, zone, true);
+ return nvme_zrm_open_flags(ns, zone, NVME_ZRM_AUTO);
}
static inline uint16_t nvme_zrm_open(NvmeNamespace *ns, NvmeZone *zone)
{
- return __nvme_zrm_open(ns, zone, false);
+ return nvme_zrm_open_flags(ns, zone, 0);
}
static void __nvme_advance_zone_wp(NvmeNamespace *ns, NvmeZone *zone,
--
2.31.1
- [PATCH 00/14] hw(/block/)nvme: spring cleaning, Klaus Jensen, 2021/04/19
- [PATCH 01/14] hw/block/nvme: rename __nvme_zrm_open,
Klaus Jensen <=
- [PATCH 02/14] hw/block/nvme: rename __nvme_advance_zone_wp, Klaus Jensen, 2021/04/19
- [PATCH 03/14] hw/block/nvme: rename __nvme_select_ns_iocs, Klaus Jensen, 2021/04/19
- [PATCH 07/14] hw/block/nvme: replace nvme_ns_status, Klaus Jensen, 2021/04/19
- [PATCH 05/14] hw/block/nvme: cleanup includes, Klaus Jensen, 2021/04/19
- [PATCH 04/14] hw/block/nvme: consolidate header files, Klaus Jensen, 2021/04/19
- [PATCH 06/14] hw/block/nvme: remove non-shared defines from header file, Klaus Jensen, 2021/04/19