[PATCH V3 3/8] nvme: pci: use admin queue timeout over NVME_ADMIN_TIMEOUT

[Daniel Wagner]

On Fri, Apr 10, 2026 at 09:39:19AM +0200, Maurizio Lombardi wrote:
> While tearing down its queues, nvme-pci uses NVME_ADMIN_TIMEOUT as its
> timeout target. Instead, use the configured admin queue's timeout value
> to match the device's existing timeout setting.
> 
> Signed-off-by: Maurizio Lombardi <mlombard at redhat.com>
> ---
>  drivers/nvme/host/pci.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index 9aa19255b041..379c75c6d35a 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -3091,7 +3091,7 @@ static bool __nvme_delete_io_queues(struct nvme_dev *dev, u8 opcode)
>  	unsigned long timeout;
>  
>   retry:
> -	timeout = NVME_ADMIN_TIMEOUT;
> +	timeout = dev->ctrl.admin_timeout;

Looks good to me. I went through the fabrics code to double check if
there is something similiar but it seems we are fine there as well.

Reviewed-by: Daniel Wagner <dwagner at suse.de>