From 707b44a442c3908a13dbf785347939d42b0b1557 Mon Sep 17 00:00:00 2001 From: Steven Seungcheol Lee Date: Fri, 17 Apr 2020 20:34:21 +0900 Subject: [PATCH] nvme: refactoring unnecessary functions Signed-off-by: Steven Seungcheol Lee --- nvme-ioctl.c | 10 ---------- nvme-ioctl.h | 2 -- nvme.c | 5 +---- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/nvme-ioctl.c b/nvme-ioctl.c index a6862ed..f3f17da 100644 --- a/nvme-ioctl.c +++ b/nvme-ioctl.c @@ -727,16 +727,6 @@ int nvme_ns_attachment(int fd, __u32 nsid, __u16 num_ctrls, __u16 *ctrlist, return nvme_submit_admin_passthru(fd, &cmd); } -int nvme_ns_attach_ctrls(int fd, __u32 nsid, __u16 num_ctrls, __u16 *ctrlist) -{ - return nvme_ns_attachment(fd, nsid, num_ctrls, ctrlist, true); -} - -int nvme_ns_detach_ctrls(int fd, __u32 nsid, __u16 num_ctrls, __u16 *ctrlist) -{ - return nvme_ns_attachment(fd, nsid, num_ctrls, ctrlist, false); -} - int nvme_fw_download(int fd, __u32 offset, __u32 data_len, void *data) { struct nvme_admin_cmd cmd = { diff --git a/nvme-ioctl.h b/nvme-ioctl.h index f8de98c..aae4e49 100644 --- a/nvme-ioctl.h +++ b/nvme-ioctl.h @@ -125,8 +125,6 @@ int nvme_ns_delete(int fd, __u32 nsid, __u32 timeout); int nvme_ns_attachment(int fd, __u32 nsid, __u16 num_ctrls, __u16 *ctrlist, bool attach); -int nvme_ns_attach_ctrls(int fd, __u32 nsid, __u16 num_ctrls, __u16 *ctrlist); -int nvme_ns_detach_ctrls(int fd, __u32 nsid, __u16 num_ctrls, __u16 *ctrlist); int nvme_fw_download(int fd, __u32 offset, __u32 data_len, void *data); int nvme_fw_commit(int fd, __u8 slot, __u8 action, __u8 bpid); diff --git a/nvme.c b/nvme.c index dd3ab58..903cffc 100644 --- a/nvme.c +++ b/nvme.c @@ -1098,10 +1098,7 @@ static int nvme_attach_ns(int argc, char **argv, int attach, const char *desc, s for (i = 0; i < num; i++) ctrlist[i] = (uint16_t)list[i]; - if (attach) - err = nvme_ns_attach_ctrls(fd, cfg.namespace_id, num, ctrlist); - else - err = nvme_ns_detach_ctrls(fd, cfg.namespace_id, num, ctrlist); + err = nvme_ns_attachment(fd, cfg.namespace_id, num, ctrlist, attach); if (!err) printf("%s: Success, nsid:%d\n", cmd->name, cfg.namespace_id); -- 2.49.0