diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-05-17 02:47:34 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-19 08:20:57 +0200 |
| commit | 6c8371539ba03335716c40589c281672fac78b4b (patch) | |
| tree | 789abc475e7e7400dbcd22c6ee6a25714b3bb050 /drivers/nvme | |
| parent | c96833fa18a8e82eca84b2f2d1b29fa31d80dc44 (diff) | |
| download | linux-stable-6c8371539ba03335716c40589c281672fac78b4b.tar.gz linux-stable-6c8371539ba03335716c40589c281672fac78b4b.tar.bz2 linux-stable-6c8371539ba03335716c40589c281672fac78b4b.zip | |
nvme: remove the ifdef around nvme_nvm_ioctl
[ 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>
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 65f3f1a34b6b..d98ffb1ce629 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1042,10 +1042,8 @@ static int nvme_ioctl(struct block_device *bdev, fmode_t mode, 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); |