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 59A6C35505C for ; Wed, 21 Jan 2026 03:06:22 +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=1768964782; cv=none; b=YtdXe1E224Ji2dNUWkxMetFkwSxzcUyhssb6KrpuNzahfQhrKiI4sKdI8kbVyh8dnGZbU1T4/kfIr0yU/xBkB15tHs4Wb8seHYW+N3INoKHdqvPnRQGCNhTlmjWK+MpoBMbDj7h3/SADLT51k2GigKe9R1oINNzbUX1iajA4t7k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768964782; c=relaxed/simple; bh=+xofkLogfbpGWFEK04v963WfyuZLkz5gl6WmZbwlw2k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZiZK77AyB58l5K0x3bXsP3jo8ibWXSwBFmVgWaBywT7wQgWRh7009TG5oeigqaEzlVLk50iRVeZDuzhfoLZ9c2se+xwm8Cqcz78f3NqZEGbTiX9Kta/rHssj2/0ReE5fVk8/Ig1Z2qSJgL0FuxaxfNobOcGJJZUSTPpvW0Gg1Tg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GqOJ+u55; 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="GqOJ+u55" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 13DB9C16AAE; Wed, 21 Jan 2026 03:06:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768964781; bh=+xofkLogfbpGWFEK04v963WfyuZLkz5gl6WmZbwlw2k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GqOJ+u55QkbFMZC6U9QwHCSYW6POlAOY+W2iehB65+Hm2f0K2Zg5K80LIimJI68N0 iHojNV5+Yv6y27HgsHnhIDfcIikbfUOeZ0AInOsIspNiQK5c4t2mlAympOcdO30arK dFhacDTT/c84BRghDLifO/1zJ/EWplUZkaCneePqiVUuyIgHklIns55YZWs0Md14LM AcL7WXITjh8hGIE3By/QB3AEajJv1+GO6WxzTM9YbWFnkd15+UJz5KugSmr+P23yOg qcPIYtCExUu0JE+RRMA9IjuF5Z4Deha176jt+6Un00wWrckUfqFQ5Gxo2IcrYLxRDn +qh3Lmj1vOoiw== From: Sasha Levin To: stable@vger.kernel.org Cc: Daniel Wagner , Christoph Hellwig , Sagi Grimberg , Hannes Reinecke , Keith Busch , Sasha Levin Subject: [PATCH 5.10.y 1/3] nvme-fc: rename free_ctrl callback to match name pattern Date: Tue, 20 Jan 2026 22:06:17 -0500 Message-ID: <20260121030619.1172509-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2026012014-ferret-pungent-817b@gregkh> References: <2026012014-ferret-pungent-817b@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 dbc9173ec0f8e..231bd724dd35a 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2409,7 +2409,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); @@ -3350,7 +3350,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