From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73274C282CE for ; Tue, 4 Jun 2019 23:28:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 42ECD206B8 for ; Tue, 4 Jun 2019 23:28:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559690906; bh=EaaW/+t8hbUzXkNE1JMimrs54aQG7lysK7CNNgNh9EY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aJcjK5Yjk7PirYf/Wvtob7CTn8U2HAau3UaG7Qxl7Fb/TdaxXrbspEDMrU9vfxlpw 89dcNieFPdBiyOEoceQuvwNNDeYnMneqwtkW2oqAPeSuJpDHhRNcdqYlfZHdcgSrnC KXqGzsfFATQETwaKgPrYS7W79aMuvQFLyvQlm7+Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727801AbfFDX2Y (ORCPT ); Tue, 4 Jun 2019 19:28:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:35938 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726293AbfFDXYq (ORCPT ); Tue, 4 Jun 2019 19:24:46 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3E979206C1; Tue, 4 Jun 2019 23:24:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559690686; bh=EaaW/+t8hbUzXkNE1JMimrs54aQG7lysK7CNNgNh9EY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wYCfnD6ELXAf1viN847zxy9T6CFalqGkIhTXmmCLvSffudvelDZGL0dgzjyPyORw/ 9U72OmaeuO3jnEali6+WHqeao/65ZN6umIpTozVDLSwbBbdIUoIeYh1zh/qoG2hujg VfGm3bQgk4nuYocpy3BnmrTWE/mF2a8zpo1beYFw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Christoph Hellwig , Keith Busch , Chaitanya Kulkarni , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 4.14 15/24] nvme: remove the ifdef around nvme_nvm_ioctl Date: Tue, 4 Jun 2019 19:24:06 -0400 Message-Id: <20190604232416.7479-15-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190604232416.7479-1-sashal@kernel.org> References: <20190604232416.7479-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christoph Hellwig [ 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 Reviewed-by: Keith Busch Reviewed-by: Chaitanya Kulkarni Signed-off-by: Sasha Levin --- drivers/nvme/host/core.c | 2 -- 1 file changed, 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); -- 2.20.1