From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0859633DEC2 for ; Wed, 21 Jan 2026 02:57:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768964222; cv=none; b=LC89EfOmksz4iWbEJgz4cyi2IGLR7aKcXVcGV7Nm++oe1vmls7UFYZGemu2o/LaSdm3LsjLjlin8YZS4fzLupLsBgV8b0gvJPfKnPhZ2zUTvMxmVdEpgZhKHxWZzfEPs64/VMNu7viQJxzbagNIbCj0MHsP5wv0VYHtJ7cQunko= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768964222; c=relaxed/simple; bh=aiNj0AZh8WCaxxOjsqqV8Dijc0tcH06PSPM89RMsw3A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X4m3mX69DwP//fZ5g+Y3GzFC4Q5x0ckKuA/lDwDcLdwfmVlGYiQ2F4FHKXVs0GTW8TUhd5zNYjjHA8NDC5FLkp5glLPyCyYp7VPm1GiDUgbsKIIfTBa8MBbs2NMniJS0biWCMv+L9Q3k7xaIiKeCrPzvZ5sFNO/AsVfEI73kfQA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iOVrrf6c; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="iOVrrf6c" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16AEAC16AAE; Wed, 21 Jan 2026 02:57:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768964221; bh=aiNj0AZh8WCaxxOjsqqV8Dijc0tcH06PSPM89RMsw3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iOVrrf6cZCdRHqj4KYfTQwybVOOm6P1ig9fvL9bOdUQelYFFaZOHvsrOrVFkbncne +z89HbyupMzaUos3m/cLIAHVu7KzJcN5HwtH4jdjxmL4A0JzdUjHIc8/CnGenqNtXT GH4CgVXWKWpMG+IC4Pb0r98I34RLJ+Z3UHbmNQu/kA79CQePKpQClTZVac7Cj2k8cT IiZkDKjzYD44e7qG++kNE1LYJ3PSDgab9eTxwvC+SA0QXr4QljM7RokK1DZqhaw1nB tBgOWA0fe+N4JznREPzKojlvV5F7Gjd/zSUD+vYaMjehEWvfQfx9XFB5+nAu8z6Cfl jqQGhdzlJlkSA== From: Sasha Levin To: stable@vger.kernel.org Cc: Daniel Wagner , Christoph Hellwig , Sagi Grimberg , Hannes Reinecke , Keith Busch , Sasha Levin Subject: [PATCH 6.1.y 1/3] nvme-fc: rename free_ctrl callback to match name pattern Date: Tue, 20 Jan 2026 21:56:57 -0500 Message-ID: <20260121025659.1157002-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026012012-catalyst-renewable-6c83@gregkh> References: <2026012012-catalyst-renewable-6c83@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Daniel Wagner [ Upstream commit 205fb5fa6fde1b5b426015eb1ff69f2ff25ef5bb ] Rename nvme_fc_nvme_ctrl_freed to nvme_fc_free_ctrl to match the name pattern for the callback. Reviewed-by: Christoph Hellwig Reviewed-by: Sagi Grimberg Reviewed-by: Hannes Reinecke Signed-off-by: Daniel Wagner Signed-off-by: Keith Busch Stable-dep-of: 0edb475ac0a7 ("nvme: fix PCIe subsystem reset controller state transition") Signed-off-by: Sasha Levin --- drivers/nvme/host/fc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 87a9801ac9f2f..71e22617c2874 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2417,7 +2417,7 @@ nvme_fc_ctrl_get(struct nvme_fc_ctrl *ctrl) * controller. Called after last nvme_put_ctrl() call */ static void -nvme_fc_nvme_ctrl_freed(struct nvme_ctrl *nctrl) +nvme_fc_free_ctrl(struct nvme_ctrl *nctrl) { struct nvme_fc_ctrl *ctrl = to_fc_ctrl(nctrl); @@ -3362,7 +3362,7 @@ static const struct nvme_ctrl_ops nvme_fc_ctrl_ops = { .reg_read32 = nvmf_reg_read32, .reg_read64 = nvmf_reg_read64, .reg_write32 = nvmf_reg_write32, - .free_ctrl = nvme_fc_nvme_ctrl_freed, + .free_ctrl = nvme_fc_free_ctrl, .submit_async_event = nvme_fc_submit_async_event, .delete_ctrl = nvme_fc_delete_ctrl, .get_address = nvmf_get_address, -- 2.51.0