Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nvme: remove the ifdef around nvme_nvm_ioctl

Browse source 
[ Upstream commit 3f98bcc58cd5f1e4668db289dcab771874cc0920 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Christoph Hellwig 2019-05-17 02:47:34 -07:00 committed by Greg Kroah-Hartman
parent a6515af9b8
commit 54261634bd
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/nvme/host/core.c
View file

@ -1311,10 +1311,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);