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 D380437E310; Tue, 21 Jul 2026 22:37:59 +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=1784673485; cv=none; b=BVACfJALWbsk7fmgxetDQ1IeixnGSZEKlS2i5O/Kq18cD99HEOxx++dMUJTVFCgFTbV5pA5RnOPycrRVPJMHcrsgm3ITL2CkzqrZOYw7gv1dYPY4LXk4czUo2Qjp+0cksAP7MWdmr9ThN2oS6jTRyPvW48EVRgqExSFi0jPrMRI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784673485; c=relaxed/simple; bh=kvV5Xf+bKQbpUMO6P3lXlAMpxLicU82T2xHZUIn6CLQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QRZ1DKN3xsa6VIzA7F00sitMt9iRyq8E+EDKkD6MvO8c+D6nsYyJvq8W8A1KtgMYTWr93otBmSkkWSZ4NxAjazs98vOk9QBLhFfBHt1I/nLt4r/JSCoBGS/vp2XrRc/0ZfzLRMnn/0tldYMlhQ1F6t/bgwmRrDapvTu6ni4y+jI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=HS7IgnSr; 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="HS7IgnSr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5A4781F000E9; Tue, 21 Jul 2026 22:37:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784673478; bh=r6Eweu8+bmJouMRh19darKscRINpAfAQBtN7Ju7hMH4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HS7IgnSrpLdjix32j8ItlxJo7dBCXj18YakijPt+pJ2kuY7wwW896vYVy85AQqpo/ uN+8aqShHEqjcZuyCjBWV5thissBxj8/MTUUQztr1vjvJG2dJl/3soQHiMMbtxMZ7J gecis6Bbew1vts/ngl/OOCa5dA5E9gOByDHbYll0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Carlos Song , Mark Brown Subject: [PATCH 5.10 135/699] spi: fsl-lpspi: replace dmaengine_terminate_all() with dmaengine_terminate_sync() Date: Tue, 21 Jul 2026 17:18:14 +0200 Message-ID: <20260721152358.754693783@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152355.667394603@linuxfoundation.org> References: <20260721152355.667394603@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 5.10-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 @@ -577,7 +577,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; } @@ -598,8 +598,8 @@ static int fsl_lpspi_dma_transfer(struct transfer_timeout); if (!timeout) { 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; } @@ -608,8 +608,8 @@ static int fsl_lpspi_dma_transfer(struct transfer_timeout); if (!timeout) { 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; } @@ -618,8 +618,8 @@ static int fsl_lpspi_dma_transfer(struct fsl_lpspi->slave_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; } @@ -628,8 +628,8 @@ static int fsl_lpspi_dma_transfer(struct fsl_lpspi->slave_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; }