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 45368C28CC3 for ; Tue, 4 Jun 2019 23:31:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 14C80206B8 for ; Tue, 4 Jun 2019 23:31:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559691076; bh=0i+zQVXzrb5VmodNQ0ufcnp/SZJyh73xln2HIpG1ftE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dpYJ36icXaVzdRLEwtp2WraWcu91EaGvT9z5wtQ7bPHhKkgVzmctW+QqCxtde/4e4 lN72yPC6D/+0a3dN6JVapRpWWEKhUSvknyATRs2PDRAqNWSt6IiIV65BQaPy4lmxRs UZi/x2tbzbTWAJqG6k7uBF7BHg0E+jHfvp1Ozy44= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727149AbfFDXXD (ORCPT ); Tue, 4 Jun 2019 19:23:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:33400 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727089AbfFDXXA (ORCPT ); Tue, 4 Jun 2019 19:23:00 -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 A295C2085A; Tue, 4 Jun 2019 23:22:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559690580; bh=0i+zQVXzrb5VmodNQ0ufcnp/SZJyh73xln2HIpG1ftE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ov/glUFG4lZlYVdIVLNRjIV2/f0jOiFbNf+oZ1Bn1WVALZAMHXLD3+/RnbtmnHKFt gkAkuey2cR/NZ+CYgTYAXlHY5NxWdvI2mnvjSQGgROUH0X/MWtYZPI1iwY1fHBLgsw oU4aCc2TxsGYorvYxtMocuAN5/9BTuMvNRqOEwUE= 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 5.1 30/60] nvme: remove the ifdef around nvme_nvm_ioctl Date: Tue, 4 Jun 2019 19:21:40 -0400 Message-Id: <20190604232212.6753-30-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190604232212.6753-1-sashal@kernel.org> References: <20190604232212.6753-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 e29c395f44d2..decc0b3a3854 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1396,10 +1396,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); -- 2.20.1