Skip to content

Commit

Permalink
hw/block/nvme: remove unused argument in nvme_ns_setup
Browse files Browse the repository at this point in the history
nvme_ns_setup() finally does not have nothing to do with NvmeCtrl
instance.

Signed-off-by: Minwoo Im <minwoo.im.dev@gmail.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
  • Loading branch information
minwooim authored and birkelund committed Feb 8, 2021
1 parent 15d024d commit 24ec776
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions hw/block/nvme-ns.c
Expand Up @@ -301,7 +301,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;
Expand Down Expand Up @@ -353,7 +353,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;
Expand Down
2 changes: 1 addition & 1 deletion hw/block/nvme-ns.h
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion hw/block/nvme.c
Expand Up @@ -4377,7 +4377,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;
}
}
Expand Down

0 comments on commit 24ec776

Please sign in to comment.