michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: spi_nrfx_spis: Fix obtaining dev pointer in event handler

Browse source 
This is a follow-up to commit 4c20403629.

CONTAINER_OF() cannot be used to obtain the device pointer from its
data pointer as this data is not contained in the device structure.
Instead, use a dedicated member in the device data structure to store
the device pointer.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This commit is contained in:
Andrzej Głąbek 2023-07-25 12:56:33 +02:00 • committed by Carles Cufí
commit 927dda06fa
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/spi/spi_nrfx_spis.c
View file

@ -17,6 +17,7 @@ LOG_MODULE_REGISTER(spi_nrfx_spis, CONFIG_SPI_LOG_LEVEL);
struct spi_nrfx_data { struct spi_nrfx_data {
struct spi_context ctx; struct spi_context ctx;
const struct device *dev;
}; };
struct spi_nrfx_config { struct spi_nrfx_config {
@ -219,10 +220,10 @@ static const struct spi_driver_api spi_nrfx_driver_api = {
static void event_handler(const nrfx_spis_evt_t *p_event, void *p_context) static void event_handler(const nrfx_spis_evt_t *p_event, void *p_context)
{ {
struct spi_nrfx_data *dev_data = p_context; struct spi_nrfx_data *dev_data = p_context;
struct device *dev = CONTAINER_OF(dev_data, struct device, data);
if (p_event->evt_type == NRFX_SPIS_XFER_DONE) { if (p_event->evt_type == NRFX_SPIS_XFER_DONE) {
spi_context_complete(&dev_data->ctx, dev, p_event->rx_amount); spi_context_complete(&dev_data->ctx, dev_data->dev,
p_event->rx_amount);
} }
} }
@ -273,6 +274,7 @@ static int spi_nrfx_init(const struct device *dev)
static struct spi_nrfx_data spi_##idx##_data = { \ static struct spi_nrfx_data spi_##idx##_data = { \
SPI_CONTEXT_INIT_LOCK(spi_##idx##_data, ctx), \ SPI_CONTEXT_INIT_LOCK(spi_##idx##_data, ctx), \
SPI_CONTEXT_INIT_SYNC(spi_##idx##_data, ctx), \ SPI_CONTEXT_INIT_SYNC(spi_##idx##_data, ctx), \
.dev = DEVICE_DT_GET(SPIS(idx)), \
}; \ }; \
PINCTRL_DT_DEFINE(SPIS(idx)); \ PINCTRL_DT_DEFINE(SPIS(idx)); \
static const struct spi_nrfx_config spi_##idx##z_config = { \ static const struct spi_nrfx_config spi_##idx##z_config = { \