lkml.org 
[lkml]   [2024]   [Feb]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v4 6/8] spi: Use new helpers from overflow.h in __spi_alloc_controller()
Date
We have two new helpers struct_size_with_data() and struct_data_pointer()
that we can utilize in __spi_alloc_controller(). Do it so.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/spi/spi.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index ba4d3fde2054..de7a23da58c6 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -3089,12 +3089,12 @@ struct spi_controller *__spi_alloc_controller(struct device *dev,
unsigned int size, bool slave)
{
struct spi_controller *ctlr;
- size_t ctlr_size = ALIGN(sizeof(*ctlr), dma_get_cache_alignment());
+ int align = dma_get_cache_alignment();

if (!dev)
return NULL;

- ctlr = kzalloc(size + ctlr_size, GFP_KERNEL);
+ ctlr = kzalloc(struct_size_with_data(ctlr, align, size), GFP_KERNEL);
if (!ctlr)
return NULL;

@@ -3114,7 +3114,7 @@ struct spi_controller *__spi_alloc_controller(struct device *dev,
ctlr->dev.class = &spi_master_class;
ctlr->dev.parent = dev;
pm_suspend_ignore_children(&ctlr->dev, true);
- spi_controller_set_devdata(ctlr, (void *)ctlr + ctlr_size);
+ spi_controller_set_devdata(ctlr, struct_data_pointer(ctlr, align));

return ctlr;
}
--
2.43.0.rc1.1.gbec44491f096

\
 
 \ /
  Last update: 2024-05-27 15:27    [W:0.129 / U:0.344 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site