From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-173.mta1.migadu.com (out-173.mta1.migadu.com [95.215.58.173]) (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 9A8F5383983 for ; Mon, 6 Jul 2026 15:04:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783350274; cv=none; b=sqq22rgJnYZXeluykc/dsqFDGP2CnDTiB/lRa20AAVzuv9ft+o+hzmw3n0zv3jhxBTQOt+UIeF4DpMHap5Mkpz34ZkHWNmim2LTjNlOljvej/gK3TqNTLn26C+1VXgMc6OcVeTNm8nkUemcf13mZG7INxXRMWim6UNPjjKYwgnA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783350274; c=relaxed/simple; bh=zBBXMLoE2TCrYVlVYb7oomLt3VwpY4MdVgmSJC4X9mE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aMiAj/pRs2xlCUO9WmhFdXqZmJrp8ixcZadL6IvHE+AWYSln6D/iE9BSsBHCR8pTYrHQsAVd/gOH5EjvWJcv0QkMh5CXk+ZBG7egSOZfM6FWmVR27+5+cLbKFGceBkEOfWp5u4tPEA+tPfw3xGTwsi7nRzh1bGlHjneP5Dauwqw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=CqvbK4Rs; arc=none smtp.client-ip=95.215.58.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="CqvbK4Rs" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1783350270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I6HV0b9sMqpNpq1FfedKJ4S6F9IUmh8TP/Cz/DVk+Z8=; b=CqvbK4RsoLH4/qwbrNeD/+kj7DtLkFYfI2qQVdUTkbDqsXWUMTPI40+DMQQWXgTEejqTVi qVYccIxhasI50UJTlcWRLRlXdymBdSNqUB3vUY1fKh+4KLPVDvsf1ZqZGINdhivXikamOC 97xHasVYHVdgyVn3pELcYwf11RqI0QU= From: Thorsten Blum To: Herbert Xu , "David S. Miller" , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea Cc: Thorsten Blum , linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] crypto: atmel-tdes - drop redundant if check in crypt_dma_stop Date: Mon, 6 Jul 2026 17:04:08 +0200 Message-ID: <20260706150404.382209-8-thorsten.blum@linux.dev> In-Reply-To: <20260706150404.382209-5-thorsten.blum@linux.dev> References: <20260706150404.382209-5-thorsten.blum@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1976; i=thorsten.blum@linux.dev; h=from:subject; bh=zBBXMLoE2TCrYVlVYb7oomLt3VwpY4MdVgmSJC4X9mE=; b=owGbwMvMwCUWt7pQ4caZUj3G02pJDFneh58WTfte9mhFGNt05c7trExqD+UnLX6R4GLk7x9fI LFb4Uh6RykLgxgXg6yYIsuDWT9m+JbWVG4yidgJM4eVCWQIAxenAEzEIYaRYVLQOQ+G7Qw1jB/9 z27df4uN4xfnzI2TNLd9OBNwM7Yys4qR4YZp2+kC7xhfnxcnvmy6kSV4p/VE0c8TGZ+2Fk9dP+G 7Jz8A X-Developer-Key: i=thorsten.blum@linux.dev; a=openpgp; fpr=1D60735E8AEF3BE473B69D84733678FD8DFEEAD4 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT The call site already checks dd->flags & TDES_FLAGS_DMA before calling atmel_tdes_crypt_dma_stop(). Remove the redundant check, return early on error, and drop the now-obsolete return variable. Signed-off-by: Thorsten Blum --- drivers/crypto/atmel-tdes.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/drivers/crypto/atmel-tdes.c b/drivers/crypto/atmel-tdes.c index 00a0b9694a26..208910d0d08d 100644 --- a/drivers/crypto/atmel-tdes.c +++ b/drivers/crypto/atmel-tdes.c @@ -601,28 +601,25 @@ static int atmel_tdes_handle_queue(struct atmel_tdes_dev *dd, static int atmel_tdes_crypt_dma_stop(struct atmel_tdes_dev *dd) { - int err = -EINVAL; size_t count; - if (dd->flags & TDES_FLAGS_DMA) { - err = 0; - if (dd->flags & TDES_FLAGS_FAST) { - dma_unmap_sg(dd->dev, dd->out_sg, 1, DMA_FROM_DEVICE); - dma_unmap_sg(dd->dev, dd->in_sg, 1, DMA_TO_DEVICE); - } else { - dma_sync_single_for_cpu(dd->dev, dd->dma_addr_out, - dd->dma_size, DMA_FROM_DEVICE); - - /* copy data */ - count = atmel_tdes_sg_copy(&dd->out_sg, &dd->out_offset, - dd->buf_out, dd->buflen, dd->dma_size, 1); - if (count != dd->dma_size) { - err = -EINVAL; - dev_dbg(dd->dev, "not all data converted: %zu\n", count); - } + if (dd->flags & TDES_FLAGS_FAST) { + dma_unmap_sg(dd->dev, dd->out_sg, 1, DMA_FROM_DEVICE); + dma_unmap_sg(dd->dev, dd->in_sg, 1, DMA_TO_DEVICE); + } else { + dma_sync_single_for_cpu(dd->dev, dd->dma_addr_out, dd->dma_size, + DMA_FROM_DEVICE); + + count = atmel_tdes_sg_copy(&dd->out_sg, &dd->out_offset, + dd->buf_out, dd->buflen, + dd->dma_size, 1); + if (count != dd->dma_size) { + dev_dbg(dd->dev, "not all data converted: %zu\n", count); + return -EINVAL; } } - return err; + + return 0; } static int atmel_tdes_crypt(struct skcipher_request *req, unsigned long mode)