diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-05-17 02:47:34 -0700 |
|---|---|---|
| committer | Keith Busch <keith.busch@intel.com> | 2019-05-17 11:07:08 -0600 |
| commit | 3f98bcc58cd5f1e4668db289dcab771874cc0920 (patch) | |
| tree | 9760e7fa586dfb452d32075cc92cc131c759da28 /drivers/nvme | |
| parent | 100c815cbd56480b3e31518475b04719c363614a (diff) | |
| download | linux-stable-3f98bcc58cd5f1e4668db289dcab771874cc0920.tar.gz linux-stable-3f98bcc58cd5f1e4668db289dcab771874cc0920.tar.bz2 linux-stable-3f98bcc58cd5f1e4668db289dcab771874cc0920.zip | |
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>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/core.c | 2 |
1 files changed, 0 insertions, 2 deletions
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); |