From dbf46b3815cc8813105aa2f0d8bc69afeb1a8538 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Mon, 3 May 2021 18:01:40 +0200 Subject: [PATCH] pm: rename device_pm_cb to pm_device_cb Prefix all device PM functions/data structures with pm. Signed-off-by: Gerard Marull-Paretas --- doc/reference/power_management/index.rst | 2 +- drivers/display/display_st7735r.c | 2 +- drivers/display/display_st7789v.c | 2 +- drivers/entropy/entropy_cc13xx_cc26xx.c | 2 +- drivers/ethernet/eth_mcux.c | 2 +- drivers/flash/spi_flash_at45.c | 2 +- drivers/gpio/gpio_dw.c | 2 +- drivers/i2c/i2c_cc13xx_cc26xx.c | 2 +- drivers/i2c/i2c_nrfx_twi.c | 2 +- drivers/i2c/i2c_nrfx_twim.c | 2 +- drivers/interrupt_controller/intc_arcv2_irq_unit.c | 2 +- drivers/interrupt_controller/intc_ioapic.c | 2 +- drivers/interrupt_controller/intc_loapic.c | 2 +- drivers/led/led_pwm.c | 2 +- drivers/pwm/pwm_nrfx.c | 2 +- drivers/sensor/apds9960/apds9960.c | 2 +- drivers/sensor/bme280/bme280.c | 2 +- drivers/sensor/bmp388/bmp388.c | 2 +- drivers/sensor/fdc2x1x/fdc2x1x.c | 2 +- drivers/sensor/lis2mdl/lis2mdl.c | 2 +- drivers/sensor/qdec_nrfx/qdec_nrfx.c | 2 +- drivers/sensor/vcnl4040/vcnl4040.c | 2 +- drivers/serial/uart_cc13xx_cc26xx.c | 2 +- drivers/serial/uart_npcx.c | 2 +- drivers/serial/uart_nrfx_uart.c | 2 +- drivers/serial/uart_nrfx_uarte.c | 2 +- drivers/serial/uart_stm32.c | 2 +- drivers/spi/spi_cc13xx_cc26xx.c | 2 +- drivers/spi/spi_nrfx_spi.c | 2 +- drivers/spi/spi_nrfx_spim.c | 2 +- drivers/timer/sys_clock_init.c | 2 +- include/device.h | 4 ++-- include/drivers/timer/system_timer.h | 2 +- include/pm/device.h | 2 +- samples/subsys/pm/device_pm/src/dummy_driver.c | 2 +- samples/subsys/pm/device_pm/src/dummy_parent.c | 2 +- tests/net/pm/src/main.c | 2 +- tests/subsys/pm/power_mgmt/src/dummy_driver.c | 2 +- 38 files changed, 39 insertions(+), 39 deletions(-) diff --git a/doc/reference/power_management/index.rst b/doc/reference/power_management/index.rst index 81f4c9be420..fba889c8089 100644 --- a/doc/reference/power_management/index.rst +++ b/doc/reference/power_management/index.rst @@ -295,7 +295,7 @@ Device Set Power State .. code-block:: c - int device_set_power_state(const struct device *dev, uint32_t device_power_state, device_pm_cb cb, void *arg); + int device_set_power_state(const struct device *dev, uint32_t device_power_state, pm_device_cb cb, void *arg); Calls the :c:func:`pm_control()` handler function implemented by the device driver with PM_DEVICE_SET_POWER_STATE command. diff --git a/drivers/display/display_st7735r.c b/drivers/display/display_st7735r.c index c1747081a1f..e61f4f4ce3e 100644 --- a/drivers/display/display_st7735r.c +++ b/drivers/display/display_st7735r.c @@ -520,7 +520,7 @@ static int st7735r_enter_sleep(struct st7735r_data *data) } static int st7735r_pm_control(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { int ret = 0; struct st7735r_data *data = (struct st7735r_data *)dev->data; diff --git a/drivers/display/display_st7789v.c b/drivers/display/display_st7789v.c index a27c4060a9c..90ffbb8b21c 100644 --- a/drivers/display/display_st7789v.c +++ b/drivers/display/display_st7789v.c @@ -409,7 +409,7 @@ static void st7789v_enter_sleep(struct st7789v_data *data) } static int st7789v_pm_control(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { int ret = 0; struct st7789v_data *data = (struct st7789v_data *)dev->data; diff --git a/drivers/entropy/entropy_cc13xx_cc26xx.c b/drivers/entropy/entropy_cc13xx_cc26xx.c index ec7c7e8b4c6..2ea0528e073 100644 --- a/drivers/entropy/entropy_cc13xx_cc26xx.c +++ b/drivers/entropy/entropy_cc13xx_cc26xx.c @@ -293,7 +293,7 @@ static int entropy_cc13xx_cc26xx_set_power_state(const struct device *dev, static int entropy_cc13xx_cc26xx_pm_control(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, + void *context, pm_device_cb cb, void *arg) { struct entropy_cc13xx_cc26xx_data *data = get_dev_data(dev); diff --git a/drivers/ethernet/eth_mcux.c b/drivers/ethernet/eth_mcux.c index b0821e1f653..9613f3e38f6 100644 --- a/drivers/ethernet/eth_mcux.c +++ b/drivers/ethernet/eth_mcux.c @@ -186,7 +186,7 @@ void eth_mcux_phy_stop(struct eth_context *context); static int eth_mcux_device_pm_control(const struct device *dev, uint32_t command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { struct eth_context *eth_ctx = (struct eth_context *)dev->data; int ret = 0; diff --git a/drivers/flash/spi_flash_at45.c b/drivers/flash/spi_flash_at45.c index 3aa62707194..c82b0a613c4 100644 --- a/drivers/flash/spi_flash_at45.c +++ b/drivers/flash/spi_flash_at45.c @@ -570,7 +570,7 @@ static int spi_flash_at45_init(const struct device *dev) #if IS_ENABLED(CONFIG_PM_DEVICE) static int spi_flash_at45_pm_control(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { struct spi_flash_at45_data *dev_data = get_dev_data(dev); const struct spi_flash_at45_config *dev_config = get_dev_config(dev); diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c index 3fda8fcb3fc..cce25e9abb4 100644 --- a/drivers/gpio/gpio_dw.c +++ b/drivers/gpio/gpio_dw.c @@ -461,7 +461,7 @@ static inline int gpio_dw_resume_from_suspend_port(const struct device *port) */ static int gpio_dw_device_ctrl(const struct device *port, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { int ret = 0; diff --git a/drivers/i2c/i2c_cc13xx_cc26xx.c b/drivers/i2c/i2c_cc13xx_cc26xx.c index c4815e70035..1a46568c4f8 100644 --- a/drivers/i2c/i2c_cc13xx_cc26xx.c +++ b/drivers/i2c/i2c_cc13xx_cc26xx.c @@ -368,7 +368,7 @@ static int i2c_cc13xx_cc26xx_set_power_state(const struct device *dev, static int i2c_cc13xx_cc26xx_pm_control(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, + void *context, pm_device_cb cb, void *arg) { int ret = 0; diff --git a/drivers/i2c/i2c_nrfx_twi.c b/drivers/i2c/i2c_nrfx_twi.c index 11f2e09b72c..50f6d674885 100644 --- a/drivers/i2c/i2c_nrfx_twi.c +++ b/drivers/i2c/i2c_nrfx_twi.c @@ -215,7 +215,7 @@ static int init_twi(const struct device *dev) #ifdef CONFIG_PM_DEVICE static int twi_nrfx_pm_control(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { int ret = 0; uint32_t pm_current_state = get_dev_data(dev)->pm_state; diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c index a519664caf7..2b72db5e778 100644 --- a/drivers/i2c/i2c_nrfx_twim.c +++ b/drivers/i2c/i2c_nrfx_twim.c @@ -265,7 +265,7 @@ static int init_twim(const struct device *dev) #ifdef CONFIG_PM_DEVICE static int twim_nrfx_pm_control(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { int ret = 0; uint32_t pm_current_state = get_dev_data(dev)->pm_state; diff --git a/drivers/interrupt_controller/intc_arcv2_irq_unit.c b/drivers/interrupt_controller/intc_arcv2_irq_unit.c index 83b41dd26b4..eb6a002a703 100644 --- a/drivers/interrupt_controller/intc_arcv2_irq_unit.c +++ b/drivers/interrupt_controller/intc_arcv2_irq_unit.c @@ -193,7 +193,7 @@ static int arc_v2_irq_unit_get_state(const struct device *dev) */ static int arc_v2_irq_unit_device_ctrl(const struct device *dev, uint32_t ctrl_command, void *context, - device_pm_cb cb, void *arg) + pm_device_cb cb, void *arg) { int ret = 0; unsigned int key = arch_irq_lock(); diff --git a/drivers/interrupt_controller/intc_ioapic.c b/drivers/interrupt_controller/intc_ioapic.c index 2411dd3f610..710a8515af6 100644 --- a/drivers/interrupt_controller/intc_ioapic.c +++ b/drivers/interrupt_controller/intc_ioapic.c @@ -305,7 +305,7 @@ int ioapic_resume_from_suspend(const struct device *port) */ static int ioapic_device_ctrl(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { int ret = 0; diff --git a/drivers/interrupt_controller/intc_loapic.c b/drivers/interrupt_controller/intc_loapic.c index c261495f8ef..89e3c00335d 100644 --- a/drivers/interrupt_controller/intc_loapic.c +++ b/drivers/interrupt_controller/intc_loapic.c @@ -404,7 +404,7 @@ int loapic_resume(const struct device *port) */ static int loapic_device_ctrl(const struct device *port, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { int ret = 0; diff --git a/drivers/led/led_pwm.c b/drivers/led/led_pwm.c index 9d46fa192db..ce259defe19 100644 --- a/drivers/led/led_pwm.c +++ b/drivers/led/led_pwm.c @@ -176,7 +176,7 @@ static int led_pwm_pm_set_state(const struct device *dev, uint32_t new_state) } static int led_pwm_pm_control(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { int err; diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c index 00718055e6c..54cd2b69100 100644 --- a/drivers/pwm/pwm_nrfx.c +++ b/drivers/pwm/pwm_nrfx.c @@ -345,7 +345,7 @@ static int pwm_nrfx_pm_control(const struct device *dev, static int pwm_##idx##_nrfx_pm_control(const struct device *dev, \ uint32_t ctrl_command, \ void *context, \ - device_pm_cb cb, \ + pm_device_cb cb, \ void *arg) \ { \ static uint32_t current_state = PM_DEVICE_ACTIVE_STATE; \ diff --git a/drivers/sensor/apds9960/apds9960.c b/drivers/sensor/apds9960/apds9960.c index 4c4ad9d24f0..a75fc428c0f 100644 --- a/drivers/sensor/apds9960/apds9960.c +++ b/drivers/sensor/apds9960/apds9960.c @@ -410,7 +410,7 @@ static int apds9960_init_interrupt(const struct device *dev) #ifdef CONFIG_PM_DEVICE static int apds9960_device_ctrl(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { const struct apds9960_config *config = dev->config; struct apds9960_data *data = dev->data; diff --git a/drivers/sensor/bme280/bme280.c b/drivers/sensor/bme280/bme280.c index 399cd3b4555..3803a0d0c1f 100644 --- a/drivers/sensor/bme280/bme280.c +++ b/drivers/sensor/bme280/bme280.c @@ -391,7 +391,7 @@ static int bme280_chip_init(const struct device *dev) #ifdef CONFIG_PM_DEVICE int bme280_pm_ctrl(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { struct bme280_data *data = to_data(dev); diff --git a/drivers/sensor/bmp388/bmp388.c b/drivers/sensor/bmp388/bmp388.c index 463c9cfaaa3..6e7000cde82 100644 --- a/drivers/sensor/bmp388/bmp388.c +++ b/drivers/sensor/bmp388/bmp388.c @@ -590,7 +590,7 @@ static int bmp388_device_ctrl( const struct device *dev, uint32_t ctrl_command, void *context, - device_pm_cb cb, + pm_device_cb cb, void *arg) { int ret = 0; diff --git a/drivers/sensor/fdc2x1x/fdc2x1x.c b/drivers/sensor/fdc2x1x/fdc2x1x.c index 8584bfdd274..53ba80f4725 100644 --- a/drivers/sensor/fdc2x1x/fdc2x1x.c +++ b/drivers/sensor/fdc2x1x/fdc2x1x.c @@ -543,7 +543,7 @@ static int fdc2x1x_set_pm_state(const struct device *dev, static int fdc2x1x_device_pm_ctrl(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { struct fdc2x1x_data *data = dev->data; uint32_t new_state; diff --git a/drivers/sensor/lis2mdl/lis2mdl.c b/drivers/sensor/lis2mdl/lis2mdl.c index 299adf9e941..8a2b7040d04 100644 --- a/drivers/sensor/lis2mdl/lis2mdl.c +++ b/drivers/sensor/lis2mdl/lis2mdl.c @@ -520,7 +520,7 @@ static int lis2mdl_set_power_state(struct lis2mdl_data *lis2mdl, } static int lis2mdl_pm_control(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { struct lis2mdl_data *lis2mdl = dev->data; const struct lis2mdl_config *const config = dev->config; diff --git a/drivers/sensor/qdec_nrfx/qdec_nrfx.c b/drivers/sensor/qdec_nrfx/qdec_nrfx.c index 8cb335ef970..10e4af5ec63 100644 --- a/drivers/sensor/qdec_nrfx/qdec_nrfx.c +++ b/drivers/sensor/qdec_nrfx/qdec_nrfx.c @@ -268,7 +268,7 @@ static int qdec_nrfx_pm_set_state(struct qdec_nrfx_data *data, static int qdec_nrfx_pm_control(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { struct qdec_nrfx_data *data = &qdec_nrfx_data; int err; diff --git a/drivers/sensor/vcnl4040/vcnl4040.c b/drivers/sensor/vcnl4040/vcnl4040.c index 4fab74ca66f..3c3c211e480 100644 --- a/drivers/sensor/vcnl4040/vcnl4040.c +++ b/drivers/sensor/vcnl4040/vcnl4040.c @@ -220,7 +220,7 @@ static int vcnl4040_ambient_setup(const struct device *dev) #ifdef CONFIG_PM_DEVICE static int vcnl4040_device_ctrl(const struct device *dev, uint32_t ctrl_command, void *context, - device_pm_cb cb, void *arg) + pm_device_cb cb, void *arg) { int ret = 0; diff --git a/drivers/serial/uart_cc13xx_cc26xx.c b/drivers/serial/uart_cc13xx_cc26xx.c index 4da884cc8f8..7ce96fa49b0 100644 --- a/drivers/serial/uart_cc13xx_cc26xx.c +++ b/drivers/serial/uart_cc13xx_cc26xx.c @@ -444,7 +444,7 @@ static int uart_cc13xx_cc26xx_set_power_state(const struct device *dev, static int uart_cc13xx_cc26xx_pm_control(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, + void *context, pm_device_cb cb, void *arg) { int ret = 0; diff --git a/drivers/serial/uart_npcx.c b/drivers/serial/uart_npcx.c index 7b7c3a5d3dd..de0a7b28cb6 100644 --- a/drivers/serial/uart_npcx.c +++ b/drivers/serial/uart_npcx.c @@ -449,7 +449,7 @@ static inline int uart_npcx_set_power_state(const struct device *dev, /* Implements the device power management control functionality */ static int uart_npcx_pm_control(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { int ret = 0; diff --git a/drivers/serial/uart_nrfx_uart.c b/drivers/serial/uart_nrfx_uart.c index 2a2d32dce98..c905dc525cb 100644 --- a/drivers/serial/uart_nrfx_uart.c +++ b/drivers/serial/uart_nrfx_uart.c @@ -1158,7 +1158,7 @@ static void uart_nrfx_set_power_state(const struct device *dev, static int uart_nrfx_pm_control(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { static uint32_t current_state = PM_DEVICE_ACTIVE_STATE; diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c index 6cc6d193e34..7a153878089 100644 --- a/drivers/serial/uart_nrfx_uarte.c +++ b/drivers/serial/uart_nrfx_uarte.c @@ -1863,7 +1863,7 @@ static void uarte_nrfx_set_power_state(const struct device *dev, static int uarte_nrfx_pm_control(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { struct uarte_nrfx_data *data = get_dev_data(dev); diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c index c9c97a634fb..f1fea416435 100644 --- a/drivers/serial/uart_stm32.c +++ b/drivers/serial/uart_stm32.c @@ -1461,7 +1461,7 @@ static int uart_stm32_set_power_state(const struct device *dev, */ static int uart_stm32_pm_control(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, + void *context, pm_device_cb cb, void *arg) { struct uart_stm32_data *data = DEV_DATA(dev); diff --git a/drivers/spi/spi_cc13xx_cc26xx.c b/drivers/spi/spi_cc13xx_cc26xx.c index 77c8abf18a4..cef96b70592 100644 --- a/drivers/spi/spi_cc13xx_cc26xx.c +++ b/drivers/spi/spi_cc13xx_cc26xx.c @@ -251,7 +251,7 @@ static int spi_cc13xx_cc26xx_set_power_state(const struct device *dev, static int spi_cc13xx_cc26xx_pm_control(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, + void *context, pm_device_cb cb, void *arg) { int ret = 0; diff --git a/drivers/spi/spi_nrfx_spi.c b/drivers/spi/spi_nrfx_spi.c index 6ed42a5a391..dd9a4b99d26 100644 --- a/drivers/spi/spi_nrfx_spi.c +++ b/drivers/spi/spi_nrfx_spi.c @@ -286,7 +286,7 @@ static int init_spi(const struct device *dev) #ifdef CONFIG_PM_DEVICE static int spi_nrfx_pm_control(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { int ret = 0; struct spi_nrfx_data *data = get_dev_data(dev); diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c index 676178cddc4..ed5b3abb9ef 100644 --- a/drivers/spi/spi_nrfx_spim.c +++ b/drivers/spi/spi_nrfx_spim.c @@ -334,7 +334,7 @@ static int init_spim(const struct device *dev) #ifdef CONFIG_PM_DEVICE static int spim_nrfx_pm_control(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { int ret = 0; struct spi_nrfx_data *data = get_dev_data(dev); diff --git a/drivers/timer/sys_clock_init.c b/drivers/timer/sys_clock_init.c index 33e15b295e5..f831d99f919 100644 --- a/drivers/timer/sys_clock_init.c +++ b/drivers/timer/sys_clock_init.c @@ -32,7 +32,7 @@ int __weak sys_clock_driver_init(const struct device *dev) int __weak sys_clock_device_ctrl(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { return -ENOTSUP; } diff --git a/include/device.h b/include/device.h index 202602e9aaf..338a81a9b24 100644 --- a/include/device.h +++ b/include/device.h @@ -387,7 +387,7 @@ struct device { #ifdef CONFIG_PM_DEVICE /** Power Management function */ int (*pm_control)(const struct device *dev, uint32_t command, - void *context, device_pm_cb cb, void *arg); + void *context, pm_device_cb cb, void *arg); /** Pointer to device instance power management data */ struct pm_device * const pm; #endif @@ -657,7 +657,7 @@ void device_busy_clear(const struct device *dev); */ static inline int device_set_power_state(const struct device *dev, uint32_t device_power_state, - device_pm_cb cb, void *arg) + pm_device_cb cb, void *arg) { if (dev->pm_control == NULL) { return -ENOSYS; diff --git a/include/drivers/timer/system_timer.h b/include/drivers/timer/system_timer.h index 2be9d7735fc..33cbbf0758e 100644 --- a/include/drivers/timer/system_timer.h +++ b/include/drivers/timer/system_timer.h @@ -48,7 +48,7 @@ extern int sys_clock_driver_init(const struct device *dev); */ extern int clock_device_ctrl(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg); + void *context, pm_device_cb cb, void *arg); /** * @brief Set system clock timeout diff --git a/include/pm/device.h b/include/pm/device.h index ef8fccdc023..0b74b118510 100644 --- a/include/pm/device.h +++ b/include/pm/device.h @@ -77,7 +77,7 @@ struct device; #define PM_DEVICE_SET_POWER_STATE 1 #define PM_DEVICE_GET_POWER_STATE 2 -typedef void (*device_pm_cb)(const struct device *dev, +typedef void (*pm_device_cb)(const struct device *dev, int status, void *context, void *arg); /** diff --git a/samples/subsys/pm/device_pm/src/dummy_driver.c b/samples/subsys/pm/device_pm/src/dummy_driver.c index 398189ba081..83d80035e21 100644 --- a/samples/subsys/pm/device_pm/src/dummy_driver.c +++ b/samples/subsys/pm/device_pm/src/dummy_driver.c @@ -116,7 +116,7 @@ static int dummy_resume_from_suspend(const struct device *dev) static int dummy_device_pm_ctrl(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { int ret = 0; diff --git a/samples/subsys/pm/device_pm/src/dummy_parent.c b/samples/subsys/pm/device_pm/src/dummy_parent.c index 729b96ee215..5699e104e49 100644 --- a/samples/subsys/pm/device_pm/src/dummy_parent.c +++ b/samples/subsys/pm/device_pm/src/dummy_parent.c @@ -47,7 +47,7 @@ static int dummy_resume_from_suspend(const struct device *dev) static int dummy_parent_pm_ctrl(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { int ret = 0; diff --git a/tests/net/pm/src/main.c b/tests/net/pm/src/main.c index 2d9ff59c98e..deaacee7d87 100644 --- a/tests/net/pm/src/main.c +++ b/tests/net/pm/src/main.c @@ -22,7 +22,7 @@ struct fake_dev_context { }; static int fake_dev_pm_control(const struct device *dev, uint32_t command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { struct fake_dev_context *ctx = dev->data; int ret = 0; diff --git a/tests/subsys/pm/power_mgmt/src/dummy_driver.c b/tests/subsys/pm/power_mgmt/src/dummy_driver.c index 789eb24e38b..d380d256605 100644 --- a/tests/subsys/pm/power_mgmt/src/dummy_driver.c +++ b/tests/subsys/pm/power_mgmt/src/dummy_driver.c @@ -40,7 +40,7 @@ static int dummy_resume_from_suspend(const struct device *dev) static int dummy_device_pm_ctrl(const struct device *dev, uint32_t ctrl_command, - void *context, device_pm_cb cb, void *arg) + void *context, pm_device_cb cb, void *arg) { int ret = 0;