Skip to content

Commit 22471f1

Browse files
janchrijhedberg
authored andcommitted
drivers: sensor: tdk: redefine trigger as ptr to make use of CONTAINER_OF
Allows CONTAINER_OF inside trigger handler to be used to obtain a valid ptr to the composite struct consisting of a struct sensor_trigger trig. Fixes #97124 Signed-off-by: Christoph Jans <[email protected]>
1 parent d3e645e commit 22471f1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/sensor/tdk/icm45686/icm45686.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ struct icm45686_triggers {
9191
const struct device *dev;
9292
struct k_mutex lock;
9393
struct {
94-
struct sensor_trigger trigger;
94+
const struct sensor_trigger *trigger;
9595
sensor_trigger_handler_t handler;
9696
} entry;
9797
#if defined(CONFIG_ICM45686_TRIGGER_OWN_THREAD)

drivers/sensor/tdk/icm45686/icm45686_trigger.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static void icm45686_thread_cb(const struct device *dev)
4343
(void)k_mutex_lock(&data->triggers.lock, K_FOREVER);
4444

4545
if (data->triggers.entry.handler) {
46-
data->triggers.entry.handler(dev, &data->triggers.entry.trigger);
46+
data->triggers.entry.handler(dev, data->triggers.entry.trigger);
4747
}
4848

4949
(void)k_mutex_unlock(&data->triggers.lock);
@@ -113,7 +113,7 @@ int icm45686_trigger_set(const struct device *dev,
113113

114114
switch (trig->type) {
115115
case SENSOR_TRIG_DATA_READY:
116-
data->triggers.entry.trigger = *trig;
116+
data->triggers.entry.trigger = trig;
117117
data->triggers.entry.handler = handler;
118118

119119
if (handler) {

0 commit comments

Comments
 (0)