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 716B128853E; Wed, 4 Feb 2026 15:18:26 +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=1770218306; cv=none; b=mXjpp6YL0Q06PEPnxWl7ai5OcmqoXC/Fbfn3wtNcEvC0KOK0zVff/ViXTKUWyVjwwmVcZ883iuzYdDeJn8JmBmQgDq4Kd8wC+lxqXuSIouC9w6/EnXHDVlopmSyUPg0uTQh5M9IAxR/JyFAQux+Yd04aNGeOTgGDFY7oDJ/yxWw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770218306; c=relaxed/simple; bh=577+cu04M7gN50x954ZOVAYvqfB6xWfUzRQ3YE0/ZHM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R3XorWaTZgDuctfr4aZr8xxvvTMtKTVQrKXgwI6IqjZfSDYE4PK1wfL5H68/976uMdARlgshFDr3ZImhr/hMligxSAQrG7jkGhUK1+o1IRhZBC23Hb1TvupfrK1NNn83BZhLhhoHZT3VaBhv6M37YyZj/2yKNCoHdeN98TtBawI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=p8Faxn4J; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="p8Faxn4J" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E06FC4CEF7; Wed, 4 Feb 2026 15:18:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770218306; bh=577+cu04M7gN50x954ZOVAYvqfB6xWfUzRQ3YE0/ZHM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p8Faxn4Jmgo76JDvEH3TIWCGRPg2miz9KUT8u7wzAe4T7apzJGk6IYT4vESRhWOHc gZ1OaiPrXTYC9/5ipvvHvDbKKst8GK+mbL4/zyj/Gnktc6h4EOaNpZn+FX1v/AvYA+ ZFNqGZ4j7OVyILYvVAUtvijgCjTVnbYFi9PaQ1zo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christoph Hellwig , Sagi Grimberg , Hannes Reinecke , Daniel Wagner , Keith Busch , Sasha Levin Subject: [PATCH 6.1 238/280] nvme-fc: rename free_ctrl callback to match name pattern Date: Wed, 4 Feb 2026 15:40:12 +0100 Message-ID: <20260204143918.190534970@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260204143909.614719725@linuxfoundation.org> References: <20260204143909.614719725@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ 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 Signed-off-by: Greg Kroah-Hartman --- drivers/nvme/host/fc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2417,7 +2417,7 @@ nvme_fc_ctrl_get(struct nvme_fc_ctrl *ct * 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_f .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,