michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: use common PM action callback naming

Browse source 
The PM callback is no longer referenced as "pm_control" but
"pm_action_cb", so reflect this new naming on the callbacks.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2021-11-02 16:19:41 +01:00 • committed by Anas Nashif
commit 4baf1e01ff
35 changed files with 115 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/display/display_st7735r.c
View file

@ -494,7 +494,7 @@ static int st7735r_init(const struct device *dev)
} }
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int st7735r_pm_control(const struct device *dev, static int st7735r_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
int ret = 0; int ret = 0;
@ -573,7 +573,7 @@ static const struct display_driver_api st7735r_api = {
.x_offset = DT_INST_PROP(inst, x_offset), \ .x_offset = DT_INST_PROP(inst, x_offset), \
.y_offset = DT_INST_PROP(inst, y_offset), \ .y_offset = DT_INST_PROP(inst, y_offset), \
}; \ }; \
DEVICE_DT_INST_DEFINE(inst, st7735r_init, st7735r_pm_control, \ DEVICE_DT_INST_DEFINE(inst, st7735r_init, st7735r_pm_action, \
&st7735r_data_ ## inst, &st7735r_config_ ## inst, \ &st7735r_data_ ## inst, &st7735r_config_ ## inst, \
POST_KERNEL, CONFIG_DISPLAY_INIT_PRIORITY, \ POST_KERNEL, CONFIG_DISPLAY_INIT_PRIORITY, \
&st7735r_api); &st7735r_api);

4
drivers/display/display_st7789v.c
View file

@ -396,7 +396,7 @@ static int st7789v_init(const struct device *dev)
} }
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int st7789v_pm_control(const struct device *dev, static int st7789v_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
struct st7789v_data *data = (struct st7789v_data *)dev->data; struct st7789v_data *data = (struct st7789v_data *)dev->data;
@ -439,5 +439,5 @@ static struct st7789v_data st7789v_data = {
}; };
DEVICE_DT_INST_DEFINE(0, &st7789v_init, DEVICE_DT_INST_DEFINE(0, &st7789v_init,
st7789v_pm_control, &st7789v_data, NULL, POST_KERNEL, st7789v_pm_action, &st7789v_data, NULL, POST_KERNEL,
CONFIG_DISPLAY_INIT_PRIORITY, &st7789v_api); CONFIG_DISPLAY_INIT_PRIORITY, &st7789v_api);

4
drivers/entropy/entropy_cc13xx_cc26xx.c
View file

@ -264,7 +264,7 @@ static int post_notify_fxn(unsigned int eventType, uintptr_t eventArg,
#endif #endif
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int entropy_cc13xx_cc26xx_pm_control(const struct device *dev, static int entropy_cc13xx_cc26xx_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
struct entropy_cc13xx_cc26xx_data *data = get_dev_data(dev); struct entropy_cc13xx_cc26xx_data *data = get_dev_data(dev);
@ -351,7 +351,7 @@ static struct entropy_cc13xx_cc26xx_data entropy_cc13xx_cc26xx_data = {
DEVICE_DT_INST_DEFINE(0, DEVICE_DT_INST_DEFINE(0,
entropy_cc13xx_cc26xx_init, entropy_cc13xx_cc26xx_init,
entropy_cc13xx_cc26xx_pm_control, entropy_cc13xx_cc26xx_pm_action,
&entropy_cc13xx_cc26xx_data, NULL, &entropy_cc13xx_cc26xx_data, NULL,
PRE_KERNEL_1, CONFIG_ENTROPY_INIT_PRIORITY, PRE_KERNEL_1, CONFIG_ENTROPY_INIT_PRIORITY,
&entropy_cc13xx_cc26xx_driver_api); &entropy_cc13xx_cc26xx_driver_api);

8
drivers/ethernet/eth_mcux.c
View file

@ -183,7 +183,7 @@ static int ts_tx_rd, ts_tx_wr;
static void eth_mcux_phy_enter_reset(struct eth_context *context); static void eth_mcux_phy_enter_reset(struct eth_context *context);
void eth_mcux_phy_stop(struct eth_context *context); void eth_mcux_phy_stop(struct eth_context *context);
static int eth_mcux_device_pm_control(const struct device *dev, static int eth_mcux_device_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
struct eth_context *eth_ctx = (struct eth_context *)dev->data; struct eth_context *eth_ctx = (struct eth_context *)dev->data;
@ -231,10 +231,10 @@ out:
return ret; return ret;
} }
#define ETH_MCUX_PM_FUNC eth_mcux_device_pm_control #define ETH_MCUX_PM_ACTION_CB eth_mcux_device_pm_action
#else #else
#define ETH_MCUX_PM_FUNC NULL #define ETH_MCUX_PM_ACTION_CB NULL
#endif /* CONFIG_NET_POWER_MANAGEMENT */ #endif /* CONFIG_NET_POWER_MANAGEMENT */
#if ETH_MCUX_FIXED_LINK #if ETH_MCUX_FIXED_LINK
@ -1395,7 +1395,7 @@ static void eth_mcux_err_isr(const struct device *dev)
\ \
ETH_NET_DEVICE_DT_INST_DEFINE(n, \ ETH_NET_DEVICE_DT_INST_DEFINE(n, \
eth_init, \ eth_init, \
ETH_MCUX_PM_FUNC, \ ETH_MCUX_PM_ACTION_CB, \
&eth##n##_context, \ &eth##n##_context, \
&eth##n##_buffer_config, \ &eth##n##_buffer_config, \
CONFIG_ETH_INIT_PRIORITY, \ CONFIG_ETH_INIT_PRIORITY, \

4
drivers/flash/spi_flash_at45.c
View file

@ -593,7 +593,7 @@ static int spi_flash_at45_init(const struct device *dev)
} }
#if IS_ENABLED(CONFIG_PM_DEVICE) #if IS_ENABLED(CONFIG_PM_DEVICE)
static int spi_flash_at45_pm_control(const struct device *dev, static int spi_flash_at45_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
const struct spi_flash_at45_config *dev_config = get_dev_config(dev); const struct spi_flash_at45_config *dev_config = get_dev_config(dev);
@ -700,7 +700,7 @@ static const struct flash_driver_api spi_flash_at45_api = {
"atmel,at45 is not compatible with its " \ "atmel,at45 is not compatible with its " \
"total size");)) \ "total size");)) \
DEVICE_DT_INST_DEFINE(idx, \ DEVICE_DT_INST_DEFINE(idx, \
spi_flash_at45_init, spi_flash_at45_pm_control, \ spi_flash_at45_init, spi_flash_at45_pm_action, \
&inst_##idx##_data, &inst_##idx##_config, \ &inst_##idx##_data, &inst_##idx##_config, \
POST_KERNEL, CONFIG_SPI_FLASH_AT45_INIT_PRIORITY, \ POST_KERNEL, CONFIG_SPI_FLASH_AT45_INIT_PRIORITY, \
&spi_flash_at45_api); &spi_flash_at45_api);

10
drivers/gpio/gpio_dw.c
View file

@ -429,7 +429,7 @@ static inline int gpio_dw_manage_callback(const struct device *port,
* Implements the driver control management functionality * Implements the driver control management functionality
* the *context may include IN data or/and OUT data * the *context may include IN data or/and OUT data
*/ */
static int gpio_dw_device_ctrl(const struct device *dev, static int gpio_dw_device_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
switch (action) { switch (action) {
@ -535,7 +535,7 @@ static struct gpio_dw_runtime gpio_0_runtime = {
}; };
DEVICE_DT_INST_DEFINE(0, DEVICE_DT_INST_DEFINE(0,
gpio_dw_initialize, gpio_dw_device_ctrl, &gpio_0_runtime, gpio_dw_initialize, gpio_dw_device_pm_action, &gpio_0_runtime,
&gpio_config_0, POST_KERNEL, CONFIG_GPIO_DW_INIT_PRIORITY, &gpio_config_0, POST_KERNEL, CONFIG_GPIO_DW_INIT_PRIORITY,
&api_funcs); &api_funcs);
@ -597,7 +597,7 @@ static struct gpio_dw_runtime gpio_1_runtime = {
}; };
DEVICE_DT_INST_DEFINE(1, DEVICE_DT_INST_DEFINE(1,
gpio_dw_initialize, gpio_dw_device_ctrl, &gpio_1_runtime, gpio_dw_initialize, gpio_dw_device_pm_action, &gpio_1_runtime,
&gpio_dw_config_1, POST_KERNEL, CONFIG_GPIO_DW_INIT_PRIORITY, &gpio_dw_config_1, POST_KERNEL, CONFIG_GPIO_DW_INIT_PRIORITY,
&api_funcs); &api_funcs);
@ -658,7 +658,7 @@ static struct gpio_dw_runtime gpio_2_runtime = {
}; };
DEVICE_DT_INST_DEFINE(2, DEVICE_DT_INST_DEFINE(2,
gpio_dw_initialize, gpio_dw_device_ctrl, &gpio_2_runtime, gpio_dw_initialize, gpio_dw_device_pm_action, &gpio_2_runtime,
&gpio_dw_config_2, POST_KERNEL, CONFIG_GPIO_DW_INIT_PRIORITY, &gpio_dw_config_2, POST_KERNEL, CONFIG_GPIO_DW_INIT_PRIORITY,
&api_funcs); &api_funcs);
@ -719,7 +719,7 @@ static struct gpio_dw_runtime gpio_3_runtime = {
}; };
DEVICE_DT_INST_DEFINE(3, DEVICE_DT_INST_DEFINE(3,
gpio_dw_initialize, gpio_dw_device_ctrl, &gpio_3_runtime, gpio_dw_initialize, gpio_dw_device_pm_action, &gpio_3_runtime,
&gpio_dw_config_3, POST_KERNEL, CONFIG_GPIO_DW_INIT_PRIORITY, &gpio_dw_config_3, POST_KERNEL, CONFIG_GPIO_DW_INIT_PRIORITY,
&api_funcs); &api_funcs);

6
drivers/gpio/gpio_emul.c
View file

@ -664,7 +664,7 @@ static int gpio_emul_init(const struct device *dev)
} }
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int gpio_emul_pm_device_ctrl(const struct device *dev, static int gpio_emul_pm_device_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
ARG_UNUSED(dev); ARG_UNUSED(dev);
@ -673,7 +673,7 @@ static int gpio_emul_pm_device_ctrl(const struct device *dev,
return 0; return 0;
} }
#else #else
#define gpio_emul_pm_device_ctrl NULL #define gpio_emul_pm_device_pm_action NULL
#endif #endif
/* /*
@ -710,7 +710,7 @@ static int gpio_emul_pm_device_ctrl(const struct device *dev,
}; \ }; \
\ \
DEVICE_DT_INST_DEFINE(_num, gpio_emul_init, \ DEVICE_DT_INST_DEFINE(_num, gpio_emul_init, \
gpio_emul_pm_device_ctrl, \ gpio_emul_pm_device_pm_action, \
&gpio_emul_data_##_num, \ &gpio_emul_data_##_num, \
&gpio_emul_config_##_num, POST_KERNEL, \ &gpio_emul_config_##_num, POST_KERNEL, \
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \

4
drivers/gpio/gpio_stm32.c
View file

@ -570,7 +570,7 @@ static const struct gpio_driver_api gpio_stm32_driver = {
}; };
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int gpio_stm32_pm_device_ctrl(const struct device *dev, static int gpio_stm32_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
switch (action) { switch (action) {
@ -632,7 +632,7 @@ static int gpio_stm32_init(const struct device *dev)
static struct gpio_stm32_data gpio_stm32_data_## __suffix; \ static struct gpio_stm32_data gpio_stm32_data_## __suffix; \
DEVICE_DT_DEFINE(__node, \ DEVICE_DT_DEFINE(__node, \
gpio_stm32_init, \ gpio_stm32_init, \
gpio_stm32_pm_device_ctrl, \ gpio_stm32_pm_action, \
&gpio_stm32_data_## __suffix, \ &gpio_stm32_data_## __suffix, \
&gpio_stm32_cfg_## __suffix, \ &gpio_stm32_cfg_## __suffix, \
PRE_KERNEL_1, \ PRE_KERNEL_1, \

4
drivers/i2c/i2c_cc13xx_cc26xx.c
View file

@ -326,7 +326,7 @@ static int postNotifyFxn(unsigned int eventType, uintptr_t eventArg,
#endif #endif
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int i2c_cc13xx_cc26xx_pm_control(const struct device *dev, static int i2c_cc13xx_cc26xx_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
int ret = 0; int ret = 0;
@ -437,7 +437,7 @@ static struct i2c_cc13xx_cc26xx_data i2c_cc13xx_cc26xx_data = {
DEVICE_DT_INST_DEFINE(0, DEVICE_DT_INST_DEFINE(0,
i2c_cc13xx_cc26xx_init, i2c_cc13xx_cc26xx_init,
i2c_cc13xx_cc26xx_pm_control, i2c_cc13xx_cc26xx_pm_action,
&i2c_cc13xx_cc26xx_data, &i2c_cc13xx_cc26xx_config, &i2c_cc13xx_cc26xx_data, &i2c_cc13xx_cc26xx_config,
POST_KERNEL, CONFIG_I2C_INIT_PRIORITY, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY,
&i2c_cc13xx_cc26xx_driver_api); &i2c_cc13xx_cc26xx_driver_api);

4
drivers/i2c/i2c_nrfx_twi.c
View file

@ -225,7 +225,7 @@ static int init_twi(const struct device *dev)
} }
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int twi_nrfx_pm_control(const struct device *dev, static int twi_nrfx_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
int ret = 0; int ret = 0;
@ -287,7 +287,7 @@ static int twi_nrfx_pm_control(const struct device *dev,
}; \ }; \
DEVICE_DT_DEFINE(I2C(idx), \ DEVICE_DT_DEFINE(I2C(idx), \
twi_##idx##_init, \ twi_##idx##_init, \
twi_nrfx_pm_control, \ twi_nrfx_pm_action, \
&twi_##idx##_data, \ &twi_##idx##_data, \
&twi_##idx##z_config, \ &twi_##idx##z_config, \
POST_KERNEL, \ POST_KERNEL, \

4
drivers/i2c/i2c_nrfx_twim.c
View file

@ -290,7 +290,7 @@ static int init_twim(const struct device *dev)
} }
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int twim_nrfx_pm_control(const struct device *dev, static int twim_nrfx_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
int ret = 0; int ret = 0;
@ -372,7 +372,7 @@ static int twim_nrfx_pm_control(const struct device *dev,
}; \ }; \
DEVICE_DT_DEFINE(I2C(idx), \ DEVICE_DT_DEFINE(I2C(idx), \
twim_##idx##_init, \ twim_##idx##_init, \
twim_nrfx_pm_control, \ twim_nrfx_pm_action, \
&twim_##idx##_data, \ &twim_##idx##_data, \
&twim_##idx##z_config, \ &twim_##idx##z_config, \
POST_KERNEL, \ POST_KERNEL, \

4
drivers/interrupt_controller/intc_ioapic.c
View file

@ -309,7 +309,7 @@ int ioapic_resume_from_suspend(const struct device *port)
* the *context may include IN data or/and OUT data * the *context may include IN data or/and OUT data
*/ */
__pinned_func __pinned_func
static int ioapic_device_ctrl(const struct device *dev, static int ioapic_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
int ret = 0; int ret = 0;
@ -497,7 +497,7 @@ static void IoApicRedUpdateLo(unsigned int irq,
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
SYS_DEVICE_DEFINE("ioapic", ioapic_init, ioapic_device_ctrl, PRE_KERNEL_1, SYS_DEVICE_DEFINE("ioapic", ioapic_init, ioapic_pm_action, PRE_KERNEL_1,
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
#else #else
SYS_INIT(ioapic_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); SYS_INIT(ioapic_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);

4
drivers/interrupt_controller/intc_loapic.c
View file

@ -408,7 +408,7 @@ int loapic_resume(const struct device *port)
* the *context may include IN data or/and OUT data * the *context may include IN data or/and OUT data
*/ */
__pinned_func __pinned_func
static int loapic_device_ctrl(const struct device *dev, static int loapic_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
int ret = 0; int ret = 0;
@ -427,7 +427,7 @@ static int loapic_device_ctrl(const struct device *dev,
return ret; return ret;
} }
SYS_DEVICE_DEFINE("loapic", loapic_init, loapic_device_ctrl, PRE_KERNEL_1, SYS_DEVICE_DEFINE("loapic", loapic_init, loapic_pm_action, PRE_KERNEL_1,
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
#else #else
SYS_INIT(loapic_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); SYS_INIT(loapic_init, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);

4
drivers/led/led_pwm.c
View file

@ -114,7 +114,7 @@ static int led_pwm_init(const struct device *dev)
} }
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int led_pwm_pm_control(const struct device *dev, static int led_pwm_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
const struct led_pwm_config *config = DEV_CFG(dev); const struct led_pwm_config *config = DEV_CFG(dev);
@ -176,7 +176,7 @@ static const struct led_pwm_config led_pwm_config_##id = { \
.led = led_pwm_##id, \ .led = led_pwm_##id, \
}; \ }; \
\ \
DEVICE_DT_INST_DEFINE(id, &led_pwm_init, led_pwm_pm_control, \ DEVICE_DT_INST_DEFINE(id, &led_pwm_init, led_pwm_pm_action, \
NULL, &led_pwm_config_##id, POST_KERNEL, \ NULL, &led_pwm_config_##id, POST_KERNEL, \
CONFIG_LED_INIT_PRIORITY, &led_pwm_api); CONFIG_LED_INIT_PRIORITY, &led_pwm_api);

6
drivers/pwm/pwm_nrfx.c
View file

@ -294,7 +294,7 @@ static void pwm_nrfx_uninit(const struct device *dev)
memset(dev->data, 0, sizeof(struct pwm_nrfx_data)); memset(dev->data, 0, sizeof(struct pwm_nrfx_data));
} }
static int pwm_nrfx_pm_control(const struct device *dev, static int pwm_nrfx_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
int err = 0; int err = 0;
@ -314,7 +314,7 @@ static int pwm_nrfx_pm_control(const struct device *dev,
} }
#else #else
#define pwm_nrfx_pm_control NULL #define pwm_nrfx_pm_action NULL
#endif /* CONFIG_PM_DEVICE */ #endif /* CONFIG_PM_DEVICE */
@ -369,7 +369,7 @@ static int pwm_nrfx_pm_control(const struct device *dev,
.seq.length = NRF_PWM_CHANNEL_COUNT \ .seq.length = NRF_PWM_CHANNEL_COUNT \
}; \ }; \
DEVICE_DT_DEFINE(PWM(idx), \ DEVICE_DT_DEFINE(PWM(idx), \
pwm_nrfx_init, pwm_nrfx_pm_control, \ pwm_nrfx_init, pwm_nrfx_pm_action, \
&pwm_nrfx_##idx##_data, \ &pwm_nrfx_##idx##_data, \
&pwm_nrfx_##idx##config, \ &pwm_nrfx_##idx##config, \
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \ POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \

4
drivers/sensor/apds9960/apds9960.c
View file

@ -408,7 +408,7 @@ static int apds9960_init_interrupt(const struct device *dev)
} }
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int apds9960_device_ctrl(const struct device *dev, static int apds9960_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
const struct apds9960_config *config = dev->config; const struct apds9960_config *config = dev->config;
@ -535,5 +535,5 @@ static const struct apds9960_config apds9960_config = {
static struct apds9960_data apds9960_data; static struct apds9960_data apds9960_data;
DEVICE_DT_INST_DEFINE(0, apds9960_init, DEVICE_DT_INST_DEFINE(0, apds9960_init,
apds9960_device_ctrl, &apds9960_data, &apds9960_config, apds9960_pm_action, &apds9960_data, &apds9960_config,
POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &apds9960_driver_api); POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &apds9960_driver_api);

4
drivers/sensor/bme280/bme280.c
View file

@ -394,7 +394,7 @@ static int bme280_chip_init(const struct device *dev)
} }
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
int bme280_pm_ctrl(const struct device *dev, enum pm_device_action action) int bme280_pm_action(const struct device *dev, enum pm_device_action action)
{ {
int ret = 0; int ret = 0;
@ -448,7 +448,7 @@ int bme280_pm_ctrl(const struct device *dev, enum pm_device_action action)
(BME280_CONFIG_I2C(inst))); \ (BME280_CONFIG_I2C(inst))); \
DEVICE_DT_INST_DEFINE(inst, \ DEVICE_DT_INST_DEFINE(inst, \
bme280_chip_init, \ bme280_chip_init, \
bme280_pm_ctrl, \ bme280_pm_action, \
&bme280_data_##inst, \ &bme280_data_##inst, \
&bme280_config_##inst, \ &bme280_config_##inst, \
POST_KERNEL, \ POST_KERNEL, \

4
drivers/sensor/bmp388/bmp388.c
View file

@ -549,7 +549,7 @@ static int bmp388_get_calibration_data(const struct device *dev)
} }
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int bmp388_device_ctrl(const struct device *dev, static int bmp388_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
uint8_t reg_val; uint8_t reg_val;
@ -723,7 +723,7 @@ static int bmp388_init(const struct device *dev)
DEVICE_DT_INST_DEFINE( \ DEVICE_DT_INST_DEFINE( \
inst, \ inst, \
bmp388_init, \ bmp388_init, \
bmp388_device_ctrl, \ bmp388_pm_action, \
&bmp388_data_##inst, \ &bmp388_data_##inst, \
&bmp388_config_##inst, \ &bmp388_config_##inst, \
POST_KERNEL, \ POST_KERNEL, \

4
drivers/sensor/bq274xx/bq274xx.c
View file

@ -727,7 +727,7 @@ static int bq274xx_exit_shutdown_mode(const struct device *dev)
return 0; return 0;
} }
static int bq274xx_pm_control(const struct device *dev, static int bq274xx_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
int ret; int ret;
@ -773,7 +773,7 @@ static const struct sensor_driver_api bq274xx_battery_driver_api = {
.terminate_voltage = DT_INST_PROP(index, terminate_voltage), \ .terminate_voltage = DT_INST_PROP(index, terminate_voltage), \
}; \ }; \
\ \
DEVICE_DT_INST_DEFINE(index, &bq274xx_gauge_init, bq274xx_pm_control, \ DEVICE_DT_INST_DEFINE(index, &bq274xx_gauge_init, bq274xx_pm_action, \
&bq274xx_driver_##index, \ &bq274xx_driver_##index, \
&bq274xx_config_##index, POST_KERNEL, \ &bq274xx_config_##index, POST_KERNEL, \
CONFIG_SENSOR_INIT_PRIORITY, \ CONFIG_SENSOR_INIT_PRIORITY, \

4
drivers/sensor/fdc2x1x/fdc2x1x.c
View file

@ -481,7 +481,7 @@ static int fdc2x1x_set_shutdown(const struct device *dev, bool enable)
* @param pm_state - power management state * @param pm_state - power management state
* @return 0 in case of success, negative error code otherwise. * @return 0 in case of success, negative error code otherwise.
*/ */
static int fdc2x1x_device_pm_ctrl(const struct device *dev, static int fdc2x1x_device_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
int ret; int ret;
@ -1027,7 +1027,7 @@ static int fdc2x1x_init(const struct device *dev)
\ \
DEVICE_DT_INST_DEFINE(n, \ DEVICE_DT_INST_DEFINE(n, \
fdc2x1x_init, \ fdc2x1x_init, \
fdc2x1x_device_pm_ctrl, \ fdc2x1x_device_pm_action, \
&fdc2x1x_data_##n, \ &fdc2x1x_data_##n, \
&fdc2x1x_config_##n, \ &fdc2x1x_config_##n, \
POST_KERNEL, \ POST_KERNEL, \

5
drivers/sensor/ina219/ina219.c
View file

@ -217,7 +217,8 @@ static int ina219_channel_get(const struct device *dev,
} }
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int ina219_pm_ctrl(const struct device *dev, enum pm_device_action action) static int ina219_pm_action(const struct device *dev,
enum pm_device_action action)
{ {
uint16_t reg_val; uint16_t reg_val;
@ -303,7 +304,7 @@ static const struct sensor_driver_api ina219_api = {
\ \
DEVICE_DT_INST_DEFINE(n, \ DEVICE_DT_INST_DEFINE(n, \
ina219_init, \ ina219_init, \
ina219_pm_ctrl,\ ina219_pm_action, \
&ina219_data_##n, \ &ina219_data_##n, \
&ina219_config_##n, \ &ina219_config_##n, \
POST_KERNEL, \ POST_KERNEL, \

4
drivers/sensor/lis2mdl/lis2mdl.c
View file

@ -442,7 +442,7 @@ static int lis2mdl_init(const struct device *dev)
} }
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int lis2mdl_pm_control(const struct device *dev, static int lis2mdl_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
const struct lis2mdl_config *config = dev->config; const struct lis2mdl_config *config = dev->config;
@ -490,7 +490,7 @@ static int lis2mdl_pm_control(const struct device *dev,
#define LIS2MDL_DEVICE_INIT(inst) \ #define LIS2MDL_DEVICE_INIT(inst) \
DEVICE_DT_INST_DEFINE(inst, \ DEVICE_DT_INST_DEFINE(inst, \
lis2mdl_init, \ lis2mdl_init, \
lis2mdl_pm_control, \ lis2mdl_pm_action, \
&lis2mdl_data_##inst, \ &lis2mdl_data_##inst, \
&lis2mdl_config_##inst, \ &lis2mdl_config_##inst, \
POST_KERNEL, \ POST_KERNEL, \

9
drivers/sensor/lm77/lm77.c
View file

@ -361,7 +361,8 @@ static int lm77_init(const struct device *dev)
} }
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int lm77_pm_control(const struct device *dev, enum pm_device_action action) static int lm77_pm_action(const struct device *dev,
enum pm_device_action action)
{ {
const struct lm77_config *config = dev->config; const struct lm77_config *config = dev->config;
union lm77_reg_config creg = config->config_dt; union lm77_reg_config creg = config->config_dt;
@ -395,9 +396,9 @@ static int lm77_pm_control(const struct device *dev, enum pm_device_action actio
#endif /* ! LM77_TRIGGER_SUPPORT */ #endif /* ! LM77_TRIGGER_SUPPORT */
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
#define LM77_PM_CONTROL_FUNC lm77_pm_control #define LM77_PM_ACTION_CB lm77_pm_action
#else /* CONFIG_PM_DEVICE */ #else /* CONFIG_PM_DEVICE */
#define LM77_PM_CONTROL_FUNC NULL #define LM77_PM_ACTION_CB NULL
#endif /* ! CONFIG_PM_DEVICE */ #endif /* ! CONFIG_PM_DEVICE */
#define LM77_INIT(n) \ #define LM77_INIT(n) \
@ -417,7 +418,7 @@ static int lm77_pm_control(const struct device *dev, enum pm_device_action actio
}; \ }; \
\ \
DEVICE_DT_INST_DEFINE(n, lm77_init, \ DEVICE_DT_INST_DEFINE(n, lm77_init, \
LM77_PM_CONTROL_FUNC, \ LM77_PM_ACTION_CB, \
&lm77_data_##n, \ &lm77_data_##n, \
&lm77_config_##n, POST_KERNEL, \ &lm77_config_##n, POST_KERNEL, \
CONFIG_SENSOR_INIT_PRIORITY, \ CONFIG_SENSOR_INIT_PRIORITY, \

4
drivers/sensor/qdec_nrfx/qdec_nrfx.c
View file

@ -207,7 +207,7 @@ static int qdec_nrfx_init(const struct device *dev)
} }
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int qdec_nrfx_pm_control(const struct device *dev, static int qdec_nrfx_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
ARG_UNUSED(dev); ARG_UNUSED(dev);
@ -242,5 +242,5 @@ static const struct sensor_driver_api qdec_nrfx_driver_api = {
}; };
DEVICE_DT_INST_DEFINE(0, qdec_nrfx_init, DEVICE_DT_INST_DEFINE(0, qdec_nrfx_init,
qdec_nrfx_pm_control, NULL, NULL, POST_KERNEL, qdec_nrfx_pm_action, NULL, NULL, POST_KERNEL,
CONFIG_SENSOR_INIT_PRIORITY, &qdec_nrfx_driver_api); CONFIG_SENSOR_INIT_PRIORITY, &qdec_nrfx_driver_api);

5
drivers/sensor/sgp40/sgp40.c
View file

@ -186,7 +186,8 @@ static int sgp40_channel_get(const struct device *dev,
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int sgp40_pm_ctrl(const struct device *dev, enum pm_device_action action) static int sgp40_pm_action(const struct device *dev,
enum pm_device_action action)
{ {
uint16_t cmd; uint16_t cmd;
@ -256,7 +257,7 @@ static const struct sensor_driver_api sgp40_api = {
\ \
DEVICE_DT_INST_DEFINE(n, \ DEVICE_DT_INST_DEFINE(n, \
sgp40_init, \ sgp40_init, \
sgp40_pm_ctrl,\ sgp40_pm_action, \
&sgp40_data_##n, \ &sgp40_data_##n, \
&sgp40_config_##n, \ &sgp40_config_##n, \
POST_KERNEL, \ POST_KERNEL, \

5
drivers/sensor/si7210/si7210.c
View file

@ -425,7 +425,8 @@ static const struct sensor_driver_api si7210_api_funcs = {
}; };
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int si7210_pm_ctrl(const struct device *dev, enum pm_device_action action) static int si7210_pm_action(const struct device *dev,
enum pm_device_action action)
{ {
int rc; int rc;
@ -536,7 +537,7 @@ static int si7210_init(const struct device *dev)
static const struct si7210_config si7210_config_##inst = { \ static const struct si7210_config si7210_config_##inst = { \
.bus = I2C_DT_SPEC_INST_GET(inst), \ .bus = I2C_DT_SPEC_INST_GET(inst), \
}; \ }; \
DEVICE_DT_INST_DEFINE(inst, si7210_init, si7210_pm_ctrl, \ DEVICE_DT_INST_DEFINE(inst, si7210_init, si7210_pm_action, \
&si7210_data_##inst, &si7210_config_##inst, POST_KERNEL, \ &si7210_data_##inst, &si7210_config_##inst, POST_KERNEL, \
CONFIG_SENSOR_INIT_PRIORITY, &si7210_api_funcs); CONFIG_SENSOR_INIT_PRIORITY, &si7210_api_funcs);

4
drivers/sensor/vcnl4040/vcnl4040.c
View file

@ -218,7 +218,7 @@ static int vcnl4040_ambient_setup(const struct device *dev)
#endif #endif
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int vcnl4040_device_ctrl(const struct device *dev, static int vcnl4040_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
int ret = 0; int ret = 0;
@ -364,5 +364,5 @@ static const struct vcnl4040_config vcnl4040_config = {
static struct vcnl4040_data vcnl4040_data; static struct vcnl4040_data vcnl4040_data;
DEVICE_DT_INST_DEFINE(0, vcnl4040_init, DEVICE_DT_INST_DEFINE(0, vcnl4040_init,
vcnl4040_device_ctrl, &vcnl4040_data, &vcnl4040_config, vcnl4040_pm_action, &vcnl4040_data, &vcnl4040_config,
POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &vcnl4040_driver_api); POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &vcnl4040_driver_api);

4
drivers/serial/uart_cc13xx_cc26xx.c
View file

@ -397,7 +397,7 @@ static int postNotifyFxn(unsigned int eventType, uintptr_t eventArg,
#endif #endif
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int uart_cc13xx_cc26xx_pm_control(const struct device *dev, static int uart_cc13xx_cc26xx_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
int ret = 0; int ret = 0;
@ -537,7 +537,7 @@ static const struct uart_driver_api uart_cc13xx_cc26xx_driver_api = {
#define UART_CC13XX_CC26XX_DEVICE_DEFINE(n) \ #define UART_CC13XX_CC26XX_DEVICE_DEFINE(n) \
DEVICE_DT_INST_DEFINE(n, \ DEVICE_DT_INST_DEFINE(n, \
uart_cc13xx_cc26xx_init_##n, \ uart_cc13xx_cc26xx_init_##n, \
uart_cc13xx_cc26xx_pm_control, \ uart_cc13xx_cc26xx_pm_action, \
&uart_cc13xx_cc26xx_data_##n, &uart_cc13xx_cc26xx_config_##n,\ &uart_cc13xx_cc26xx_data_##n, &uart_cc13xx_cc26xx_config_##n,\
PRE_KERNEL_1, CONFIG_SERIAL_INIT_PRIORITY, \ PRE_KERNEL_1, CONFIG_SERIAL_INIT_PRIORITY, \
&uart_cc13xx_cc26xx_driver_api) &uart_cc13xx_cc26xx_driver_api)

9
drivers/serial/uart_neorv32.c
View file

@ -440,7 +440,8 @@ static int neorv32_uart_init(const struct device *dev)
} }
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int neorv32_uart_pm_control(const struct device *dev, enum pm_device_action action) static int neorv32_uart_pm_action(const struct device *dev,
enum pm_device_action action)
{ {
uint32_t ctrl = neorv32_uart_read_ctrl(dev); uint32_t ctrl = neorv32_uart_read_ctrl(dev);
@ -484,9 +485,9 @@ static const struct uart_driver_api neorv32_uart_driver_api = {
}; };
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
#define NEORV32_UART_PM_CONTROL_FUNC neorv32_uart_pm_control #define NEORV32_UART_PM_ACTION_CB neorv32_uart_pm_action
#else /* CONFIG_PM_DEVICE */ #else /* CONFIG_PM_DEVICE */
#define NEORV32_UART_PM_CONTROL_FUNC NULL #define NEORV32_UART_PM_ACTION_CB NULL
#endif /* ! CONFIG_PM_DEVICE */ #endif /* ! CONFIG_PM_DEVICE */
#ifdef CONFIG_UART_INTERRUPT_DRIVEN #ifdef CONFIG_UART_INTERRUPT_DRIVEN
@ -536,7 +537,7 @@ static const struct uart_driver_api neorv32_uart_driver_api = {
}; \ }; \
\ \
DEVICE_DT_DEFINE(node_id, &neorv32_uart_init, \ DEVICE_DT_DEFINE(node_id, &neorv32_uart_init, \
NEORV32_UART_PM_CONTROL_FUNC, \ NEORV32_UART_PM_ACTION_CB, \
&neorv32_uart_##n##_data, \ &neorv32_uart_##n##_data, \
&neorv32_uart_##n##_config, \ &neorv32_uart_##n##_config, \
PRE_KERNEL_1, \ PRE_KERNEL_1, \

4
drivers/serial/uart_npcx.c
View file

@ -438,7 +438,7 @@ static inline bool uart_npcx_device_is_transmitting(const struct device *dev)
return 0; return 0;
} }
static inline int uart_npcx_pm_control(const struct device *dev, static inline int uart_npcx_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
/* If next device power state is SUSPEND power state */ /* If next device power state is SUSPEND power state */
@ -504,7 +504,7 @@ static inline int uart_npcx_pm_control(const struct device *dev,
\ \
DEVICE_DT_INST_DEFINE(inst, \ DEVICE_DT_INST_DEFINE(inst, \
&uart_npcx_init, \ &uart_npcx_init, \
uart_npcx_pm_control, \ uart_npcx_pm_action, \
&uart_npcx_data_##inst, &uart_npcx_cfg_##inst, \ &uart_npcx_data_##inst, &uart_npcx_cfg_##inst, \
PRE_KERNEL_1, CONFIG_SERIAL_INIT_PRIORITY, \ PRE_KERNEL_1, CONFIG_SERIAL_INIT_PRIORITY, \
&uart_npcx_driver_api); \ &uart_npcx_driver_api); \

4
drivers/serial/uart_nrfx_uart.c
View file

@ -1142,7 +1142,7 @@ static void uart_nrfx_pins_enable(const struct device *dev, bool enable)
} }
} }
static int uart_nrfx_pm_control(const struct device *dev, static int uart_nrfx_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
switch (action) { switch (action) {
@ -1183,7 +1183,7 @@ static struct uart_nrfx_data uart_nrfx_uart0_data = {
DEVICE_DT_INST_DEFINE(0, DEVICE_DT_INST_DEFINE(0,
uart_nrfx_init, uart_nrfx_init,
uart_nrfx_pm_control, uart_nrfx_pm_action,
&uart_nrfx_uart0_data, &uart_nrfx_uart0_data,
NULL, NULL,
/* Initialize UART device before UART console. */ /* Initialize UART device before UART console. */

4
drivers/serial/uart_nrfx_uarte.c
View file

@ -1831,7 +1831,7 @@ static void wait_for_tx_stopped(const struct device *dev)
} }
static int uarte_nrfx_pm_control(const struct device *dev, static int uarte_nrfx_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
NRF_UARTE_Type *uarte = get_uarte_instance(dev); NRF_UARTE_Type *uarte = get_uarte_instance(dev);
@ -1999,7 +1999,7 @@ static int uarte_nrfx_pm_control(const struct device *dev,
} \ } \
DEVICE_DT_DEFINE(UARTE(idx), \ DEVICE_DT_DEFINE(UARTE(idx), \
uarte_##idx##_init, \ uarte_##idx##_init, \
uarte_nrfx_pm_control, \ uarte_nrfx_pm_action, \
&uarte_##idx##_data, \ &uarte_##idx##_data, \
&uarte_##idx##z_config, \ &uarte_##idx##z_config, \
PRE_KERNEL_1, \ PRE_KERNEL_1, \

4
drivers/spi/spi_cc13xx_cc26xx.c
View file

@ -208,7 +208,7 @@ static int spi_cc13xx_cc26xx_release(const struct device *dev,
} }
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int spi_cc13xx_cc26xx_pm_control(const struct device *dev, static int spi_cc13xx_cc26xx_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
switch (action) { switch (action) {
@ -292,7 +292,7 @@ static const struct spi_driver_api spi_cc13xx_cc26xx_driver_api = {
#define SPI_CC13XX_CC26XX_DEVICE_INIT(n) \ #define SPI_CC13XX_CC26XX_DEVICE_INIT(n) \
DEVICE_DT_INST_DEFINE(n, \ DEVICE_DT_INST_DEFINE(n, \
spi_cc13xx_cc26xx_init_##n, \ spi_cc13xx_cc26xx_init_##n, \
spi_cc13xx_cc26xx_pm_control, \ spi_cc13xx_cc26xx_pm_action, \
&spi_cc13xx_cc26xx_data_##n, &spi_cc13xx_cc26xx_config_##n, \ &spi_cc13xx_cc26xx_data_##n, &spi_cc13xx_cc26xx_config_##n, \
POST_KERNEL, CONFIG_SPI_INIT_PRIORITY, \ POST_KERNEL, CONFIG_SPI_INIT_PRIORITY, \
&spi_cc13xx_cc26xx_driver_api) &spi_cc13xx_cc26xx_driver_api)

4
drivers/spi/spi_nrfx_spi.c
View file

@ -273,7 +273,7 @@ static const struct spi_driver_api spi_nrfx_driver_api = {
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int spi_nrfx_pm_control(const struct device *dev, static int spi_nrfx_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
int ret = 0; int ret = 0;
@ -351,7 +351,7 @@ static int spi_nrfx_pm_control(const struct device *dev,
}; \ }; \
DEVICE_DT_DEFINE(SPI(idx), \ DEVICE_DT_DEFINE(SPI(idx), \
spi_##idx##_init, \ spi_##idx##_init, \
spi_nrfx_pm_control, \ spi_nrfx_pm_action, \
&spi_##idx##_data, \ &spi_##idx##_data, \
&spi_##idx##z_config, \ &spi_##idx##z_config, \
POST_KERNEL, CONFIG_SPI_INIT_PRIORITY, \ POST_KERNEL, CONFIG_SPI_INIT_PRIORITY, \

4
drivers/spi/spi_nrfx_spim.c
View file

@ -330,7 +330,7 @@ static const struct spi_driver_api spi_nrfx_driver_api = {
}; };
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static int spim_nrfx_pm_control(const struct device *dev, static int spim_nrfx_pm_action(const struct device *dev,
enum pm_device_action action) enum pm_device_action action)
{ {
int ret = 0; int ret = 0;
@ -420,7 +420,7 @@ static int spim_nrfx_pm_control(const struct device *dev,
}; \ }; \
DEVICE_DT_DEFINE(SPIM(idx), \ DEVICE_DT_DEFINE(SPIM(idx), \
spi_##idx##_init, \ spi_##idx##_init, \
spim_nrfx_pm_control, \ spim_nrfx_pm_action, \
&spi_##idx##_data, \ &spi_##idx##_data, \
&spi_##idx##z_config, \ &spi_##idx##z_config, \
POST_KERNEL, CONFIG_SPI_INIT_PRIORITY, \ POST_KERNEL, CONFIG_SPI_INIT_PRIORITY, \