Re: [PATCH 29/29] crypto: talitos - Remove TALITOS_DESC_SIZE macro

From: Paul Louvel

Date: Thu Jun 04 2026 - 09:14:57 EST


On Thu Jun 4, 2026 at 11:59 AM CEST, Christophe Leroy (CS GROUP) wrote:
>
>
> Le 28/05/2026 à 11:08, Paul Louvel a écrit :
>> Now that struct talitos_desc no longer has the SEC1-only next_desc field
>> (it was moved into sec1_talitos_desc), TALITOS_DESC_SIZE is identical to
>> sizeof(struct talitos_desc) and no longer serves any purpose. Remove it
>> and use sizeof directly at each macro invocation.
>
> It is still there ...
>
> $ git grep TALITOS_DESC_SIZE drivers
> drivers/crypto/talitos/talitos.h:#define TALITOS_DESC_SIZE
> sizeof(struct talitos_desc)

My bad. At least, it is no longer _used_ in the code..

Thanks.

>
>
>>
>> Signed-off-by: Paul Louvel <paul.louvel@xxxxxxxxxxx>
>> ---
>> drivers/crypto/talitos/talitos-sec1.c | 10 +++++-----
>> drivers/crypto/talitos/talitos-sec2.c | 6 +++---
>> 2 files changed, 8 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/crypto/talitos/talitos-sec1.c b/drivers/crypto/talitos/talitos-sec1.c
>> index e4f482520372..504ce9e23e59 100644
>> --- a/drivers/crypto/talitos/talitos-sec1.c
>> +++ b/drivers/crypto/talitos/talitos-sec1.c
>> @@ -190,7 +190,7 @@ static void sec1_dma_map_request(struct device *dev,
>> while (edesc) {
>>
>> dma_desc = dma_map_single(dev, &edesc->desc.sec1.hdr,
>> - TALITOS_DESC_SIZE, DMA_BIDIRECTIONAL);
>> + sizeof(struct talitos_desc), DMA_BIDIRECTIONAL);
>>
>> if (!prev_edesc) {
>> request->dma_desc = dma_desc;
>> @@ -202,7 +202,7 @@ static void sec1_dma_map_request(struct device *dev,
>> prev_edesc->desc.sec1.next_desc = cpu_to_be32(dma_desc);
>>
>> dma_sync_single_for_device(dev, prev_dma_desc,
>> - TALITOS_DESC_SIZE, DMA_TO_DEVICE);
>> + sizeof(struct talitos_desc), DMA_TO_DEVICE);
>>
>> next:
>> prev_edesc = edesc;
>> @@ -216,12 +216,12 @@ static void sec1_dma_unmap_request(struct device *dev,
>> {
>> struct talitos_edesc *edesc;
>>
>> - dma_unmap_single(dev, request->dma_desc, TALITOS_DESC_SIZE,
>> + dma_unmap_single(dev, request->dma_desc, sizeof(struct talitos_desc),
>> DMA_BIDIRECTIONAL);
>> edesc = container_of(request->desc, struct talitos_edesc, desc);
>> while (edesc->next_desc) {
>> dma_unmap_single(dev, be32_to_cpu(edesc->desc.sec1.next_desc),
>> - TALITOS_DESC_SIZE, DMA_BIDIRECTIONAL);
>> + sizeof(struct talitos_desc), DMA_BIDIRECTIONAL);
>> edesc = edesc->next_desc;
>> }
>> }
>> @@ -239,7 +239,7 @@ static __be32 sec1_get_request_hdr(struct device *dev,
>> edesc = edesc->next_desc;
>> }
>>
>> - dma_sync_single_for_cpu(dev, dma_desc, TALITOS_DESC_SIZE,
>> + dma_sync_single_for_cpu(dev, dma_desc, sizeof(struct talitos_desc),
>> DMA_BIDIRECTIONAL);
>>
>> return edesc->desc.sec1.hdr;
>> diff --git a/drivers/crypto/talitos/talitos-sec2.c b/drivers/crypto/talitos/talitos-sec2.c
>> index 52f783ddc8b6..0df3b22510c7 100644
>> --- a/drivers/crypto/talitos/talitos-sec2.c
>> +++ b/drivers/crypto/talitos/talitos-sec2.c
>> @@ -205,7 +205,7 @@ static void sec2_dma_map_request(struct device *dev,
>> struct talitos_desc *desc)
>> {
>> request->dma_desc =
>> - dma_map_single(dev, desc, TALITOS_DESC_SIZE, DMA_BIDIRECTIONAL);
>> + dma_map_single(dev, desc, sizeof(struct talitos_desc), DMA_BIDIRECTIONAL);
>> }
>>
>> static int sec2_talitos_handle_error(struct device *dev, u32 isr, u32 isr_lo)
>> @@ -346,14 +346,14 @@ static void sec2_init_task(struct device *dev)
>> static void sec2_dma_unmap_request(struct device *dev,
>> struct talitos_request *request)
>> {
>> - dma_unmap_single(dev, request->dma_desc, TALITOS_DESC_SIZE,
>> + dma_unmap_single(dev, request->dma_desc, sizeof(struct talitos_desc),
>> DMA_BIDIRECTIONAL);
>> }
>>
>> static __be32 sec2_get_request_hdr(struct device *dev,
>> struct talitos_request *request)
>> {
>> - dma_sync_single_for_cpu(dev, request->dma_desc, TALITOS_DESC_SIZE,
>> + dma_sync_single_for_cpu(dev, request->dma_desc, sizeof(struct talitos_desc),
>> DMA_BIDIRECTIONAL);
>>
>> return request->desc->sec2.hdr;
>>




--
Paul Louvel, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com