From: Christoph Hellwig <hch@lst.de>
Date: Fri, 17 May 2019 09:47:34 +0000 (-0700)
Subject: nvme: remove the ifdef around nvme_nvm_ioctl
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3f98bcc58cd5f1e4668db289dcab771874cc0920;p=openwrt%2Fstaging%2Fblogic.git

nvme: remove the ifdef around nvme_nvm_ioctl

We already have a proper stub if lightnvm is not enabled, so don't bother
with the ifdef.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 421bffd95aee..4352f8582213 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1395,10 +1395,8 @@ static int nvme_ns_ioctl(struct nvme_ns *ns, unsigned cmd, unsigned long arg)
 	case NVME_IOCTL_SUBMIT_IO:
 		return nvme_submit_io(ns, (void __user *)arg);
 	default:
-#ifdef CONFIG_NVM
 		if (ns->ndev)
 			return nvme_nvm_ioctl(ns, cmd, arg);
-#endif
 		if (is_sed_ioctl(cmd))
 			return sed_ioctl(ns->ctrl->opal_dev, cmd,
 					 (void __user *) arg);