Commit 6a798d80 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman

nvme: remove the ifdef around nvme_nvm_ioctl

[ Upstream commit 3f98bcc5 ]

We already have a proper stub if lightnvm is not enabled, so don't bother
with the ifdef.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9dae6465
...@@ -1396,10 +1396,8 @@ static int nvme_ns_ioctl(struct nvme_ns *ns, unsigned cmd, unsigned long arg) ...@@ -1396,10 +1396,8 @@ static int nvme_ns_ioctl(struct nvme_ns *ns, unsigned cmd, unsigned long arg)
case NVME_IOCTL_SUBMIT_IO: case NVME_IOCTL_SUBMIT_IO:
return nvme_submit_io(ns, (void __user *)arg); return nvme_submit_io(ns, (void __user *)arg);
default: default:
#ifdef CONFIG_NVM
if (ns->ndev) if (ns->ndev)
return nvme_nvm_ioctl(ns, cmd, arg); return nvme_nvm_ioctl(ns, cmd, arg);
#endif
if (is_sed_ioctl(cmd)) if (is_sed_ioctl(cmd))
return sed_ioctl(ns->ctrl->opal_dev, cmd, return sed_ioctl(ns->ctrl->opal_dev, cmd,
(void __user *) arg); (void __user *) arg);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment