[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH V2 05/11] hw/block/nvme: remove unused argument in nvme_ns_se
From: |
Minwoo Im |
Subject: |
[RFC PATCH V2 05/11] hw/block/nvme: remove unused argument in nvme_ns_setup |
Date: |
Sun, 17 Jan 2021 23:53:35 +0900 |
nvme_ns_setup() finally does not have nothing to do with NvmeCtrl
instance.
Signed-off-by: Minwoo Im <minwoo.im.dev@gmail.com>
---
hw/block/nvme-ns.c | 4 ++--
hw/block/nvme-ns.h | 2 +-
hw/block/nvme.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/block/nvme-ns.c b/hw/block/nvme-ns.c
index 3f0e4e461420..c8b75fa02138 100644
--- a/hw/block/nvme-ns.c
+++ b/hw/block/nvme-ns.c
@@ -300,7 +300,7 @@ static int nvme_ns_check_constraints(NvmeNamespace *ns,
Error **errp)
return 0;
}
-int nvme_ns_setup(NvmeCtrl *n, NvmeNamespace *ns, Error **errp)
+int nvme_ns_setup(NvmeNamespace *ns, Error **errp)
{
if (nvme_ns_check_constraints(ns, errp)) {
return -1;
@@ -352,7 +352,7 @@ static void nvme_ns_realize(DeviceState *dev, Error **errp)
NvmeCtrl *n = NVME(s->parent);
Error *local_err = NULL;
- if (nvme_ns_setup(n, ns, &local_err)) {
+ if (nvme_ns_setup(ns, &local_err)) {
error_propagate_prepend(errp, local_err,
"could not setup namespace: ");
return;
diff --git a/hw/block/nvme-ns.h b/hw/block/nvme-ns.h
index f8f3c28c360b..d87c025b0ab6 100644
--- a/hw/block/nvme-ns.h
+++ b/hw/block/nvme-ns.h
@@ -174,7 +174,7 @@ static inline void nvme_aor_dec_active(NvmeNamespace *ns)
assert(ns->nr_active_zones >= 0);
}
-int nvme_ns_setup(NvmeCtrl *n, NvmeNamespace *ns, Error **errp);
+int nvme_ns_setup(NvmeNamespace *ns, Error **errp);
void nvme_ns_drain(NvmeNamespace *ns);
void nvme_ns_shutdown(NvmeNamespace *ns);
void nvme_ns_cleanup(NvmeNamespace *ns);
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index b2a9c48a9d81..9e890ce84f5e 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -4313,7 +4313,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)
ns = &n->namespace;
ns->params.nsid = 1;
- if (nvme_ns_setup(n, ns, errp)) {
+ if (nvme_ns_setup(ns, errp)) {
return;
}
}
--
2.17.1
- [RFC PATCH V2 00/11] hw/block/nvme: support multi-path for ctrl/ns, Minwoo Im, 2021/01/17
- [RFC PATCH V2 01/11] hw/block/nvme: remove unused argument in nvme_ns_init_zoned, Minwoo Im, 2021/01/17
- [RFC PATCH V2 02/11] hw/block/nvme: open code for volatile write cache, Minwoo Im, 2021/01/17
- [RFC PATCH V2 03/11] hw/block/nvme: remove unused argument in nvme_ns_init_blk, Minwoo Im, 2021/01/17
- [RFC PATCH V2 04/11] hw/block/nvme: split setup and register for namespace, Minwoo Im, 2021/01/17
- [RFC PATCH V2 05/11] hw/block/nvme: remove unused argument in nvme_ns_setup,
Minwoo Im <=
- [RFC PATCH V2 06/11] hw/block/nvme: introduce nvme-subsys device, Minwoo Im, 2021/01/17
- [RFC PATCH V2 07/11] hw/block/nvme: support to map controller to a subsystem, Minwoo Im, 2021/01/17
- [RFC PATCH V2 08/11] hw/block/nvme: add CMIC enum value for Identify Controller, Minwoo Im, 2021/01/17
- [RFC PATCH V2 10/11] hw/block/nvme: add NMIC enum value for Identify Namespace, Minwoo Im, 2021/01/17
- [RFC PATCH V2 09/11] hw/block/nvme: support for multi-controller in subsystem, Minwoo Im, 2021/01/17
- [RFC PATCH V2 11/11] hw/block/nvme: support for shared namespace in subsystem, Minwoo Im, 2021/01/17
- Re: [RFC PATCH V2 00/11] hw/block/nvme: support multi-path for ctrl/ns, Klaus Jensen, 2021/01/18