From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 25B6520E6E2; Thu, 16 Jul 2026 14:32:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784212360; cv=none; b=RTFJM76gpg4oTLQbwBU3PCfHrEZb2vPc0F8a6dGIC4a/pKYeEQAIavBciit5xYIY65thflk00Ce+iiSEhbOLuCgu6AcT5YxZ/HSsOG3MRr3g67AgTg3ZtPYiaCkj96IFPLUlkwMhckjY13lvwe0BMWx9oKxHHoNwmpgaoE8k30M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784212360; c=relaxed/simple; bh=8wYA5HS8Ogvajydgv1kyLpGkqWd2IgZ0LeNB6Iwa+GE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F81hyJtgpe5YgcYEBba7OvLlVAPsYXXjU2K0pYsxom8vK7xZHrc0+jFfWMwxJ8GtQaljpHuKrLA8eokOTtYSK4tpSK230WXVKHcm2X7p6hMm2vNjXJXonC9DArEzSAP/FRYOJOFp51UW+1yuQnXOwqit0DK35bnDR0aH1QTl/UI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=uoezpzSs; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="uoezpzSs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF3D01F000E9; Thu, 16 Jul 2026 14:32:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784212358; bh=Rptz/iOUaBIjCY1hmQ366xKvOmy8baJPx/2xEuufzNM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uoezpzSs7Sex/ZVCdicR9Nh7grKgSGu9PSkeQKDg9CcZMdAjWEc1ZJPlVQPU8bmk4 rHlmVoGWIPtBPoS27dD7Jwcd1nyy4MmuQpCbSR+p13hekAqL2FLQJPBG3mw6fmD52P vzOw6dy1yG2X7MW4Qq9CLuf3C/8RpgdsAUQMBDVg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Carlos Song , Mark Brown Subject: [PATCH 6.12 298/349] spi: fsl-lpspi: replace dmaengine_terminate_all() with dmaengine_terminate_sync() Date: Thu, 16 Jul 2026 15:33:52 +0200 Message-ID: <20260716133039.991323281@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260716133033.287196923@linuxfoundation.org> References: <20260716133033.287196923@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Carlos Song commit e703ce47691b967fe9b4057fb1d062273211afa9 upstream. dmaengine_terminate_all() has been deprecated, so replace it with dmaengine_terminate_sync(). Fixes: 09c04466ce7e ("spi: lpspi: add dma mode support") Cc: stable@vger.kernel.org Signed-off-by: Carlos Song Link: https://patch.msgid.link/20260525062357.3191349-2-carlos.song@oss.nxp.com Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi-fsl-lpspi.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) --- a/drivers/spi/spi-fsl-lpspi.c +++ b/drivers/spi/spi-fsl-lpspi.c @@ -603,7 +603,7 @@ static int fsl_lpspi_dma_transfer(struct tx->sgl, tx->nents, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!desc_tx) { - dmaengine_terminate_all(controller->dma_tx); + dmaengine_terminate_sync(controller->dma_tx); return -EINVAL; } @@ -624,8 +624,8 @@ static int fsl_lpspi_dma_transfer(struct transfer_timeout); if (!time_left) { dev_err(fsl_lpspi->dev, "I/O Error in DMA TX\n"); - dmaengine_terminate_all(controller->dma_tx); - dmaengine_terminate_all(controller->dma_rx); + dmaengine_terminate_sync(controller->dma_tx); + dmaengine_terminate_sync(controller->dma_rx); fsl_lpspi_reset(fsl_lpspi); return -ETIMEDOUT; } @@ -634,8 +634,8 @@ static int fsl_lpspi_dma_transfer(struct transfer_timeout); if (!time_left) { dev_err(fsl_lpspi->dev, "I/O Error in DMA RX\n"); - dmaengine_terminate_all(controller->dma_tx); - dmaengine_terminate_all(controller->dma_rx); + dmaengine_terminate_sync(controller->dma_tx); + dmaengine_terminate_sync(controller->dma_rx); fsl_lpspi_reset(fsl_lpspi); return -ETIMEDOUT; } @@ -644,8 +644,8 @@ static int fsl_lpspi_dma_transfer(struct fsl_lpspi->target_aborted) { dev_dbg(fsl_lpspi->dev, "I/O Error in DMA TX interrupted\n"); - dmaengine_terminate_all(controller->dma_tx); - dmaengine_terminate_all(controller->dma_rx); + dmaengine_terminate_sync(controller->dma_tx); + dmaengine_terminate_sync(controller->dma_rx); fsl_lpspi_reset(fsl_lpspi); return -EINTR; } @@ -654,8 +654,8 @@ static int fsl_lpspi_dma_transfer(struct fsl_lpspi->target_aborted) { dev_dbg(fsl_lpspi->dev, "I/O Error in DMA RX interrupted\n"); - dmaengine_terminate_all(controller->dma_tx); - dmaengine_terminate_all(controller->dma_rx); + dmaengine_terminate_sync(controller->dma_tx); + dmaengine_terminate_sync(controller->dma_rx); fsl_lpspi_reset(fsl_lpspi); return -EINTR; }