diff --git a/drivers/display/display_st7735r.c b/drivers/display/display_st7735r.c index 130193a5e14..a94993b7bc1 100644 --- a/drivers/display/display_st7735r.c +++ b/drivers/display/display_st7735r.c @@ -553,10 +553,6 @@ static int st7735r_pm_control(const struct device *dev, uint32_t ctrl_command, ret = -EINVAL; } - if (cb != NULL) { - cb(dev, ret, state, arg); - } - return ret; } #endif /* CONFIG_PM_DEVICE */ diff --git a/drivers/display/display_st7789v.c b/drivers/display/display_st7789v.c index 7ef4b4422e0..9c710e4ec67 100644 --- a/drivers/display/display_st7789v.c +++ b/drivers/display/display_st7789v.c @@ -433,9 +433,6 @@ static int st7789v_pm_control(const struct device *dev, uint32_t ctrl_command, ret = -EINVAL; } - if (cb != NULL) { - cb(dev, ret, state, arg); - } return ret; } #endif /* CONFIG_PM_DEVICE */ diff --git a/drivers/entropy/entropy_cc13xx_cc26xx.c b/drivers/entropy/entropy_cc13xx_cc26xx.c index df4535ce091..679f85a3460 100644 --- a/drivers/entropy/entropy_cc13xx_cc26xx.c +++ b/drivers/entropy/entropy_cc13xx_cc26xx.c @@ -312,10 +312,6 @@ static int entropy_cc13xx_cc26xx_pm_control(const struct device *dev, *state = data->pm_state; } - if (cb) { - cb(dev, ret, state, arg); - } - return ret; } #endif /* CONFIG_PM_DEVICE */ diff --git a/drivers/ethernet/eth_mcux.c b/drivers/ethernet/eth_mcux.c index c22e237e3a6..e29e90ce0ad 100644 --- a/drivers/ethernet/eth_mcux.c +++ b/drivers/ethernet/eth_mcux.c @@ -228,9 +228,6 @@ static int eth_mcux_device_pm_control(const struct device *dev, } out: - if (cb) { - cb(dev, ret, state, arg); - } return ret; } diff --git a/drivers/flash/spi_flash_at45.c b/drivers/flash/spi_flash_at45.c index eef0edfbbd7..0fedc01cb38 100644 --- a/drivers/flash/spi_flash_at45.c +++ b/drivers/flash/spi_flash_at45.c @@ -670,10 +670,6 @@ static int spi_flash_at45_pm_control(const struct device *dev, *state = dev_data->pm_state; } - if (cb) { - cb(dev, err, state, arg); - } - return err; } #endif /* IS_ENABLED(CONFIG_PM_DEVICE) */ diff --git a/drivers/gpio/gpio_dw.c b/drivers/gpio/gpio_dw.c index 0eda266d771..e3e84d72c5d 100644 --- a/drivers/gpio/gpio_dw.c +++ b/drivers/gpio/gpio_dw.c @@ -475,9 +475,6 @@ static int gpio_dw_device_ctrl(const struct device *port, *state = gpio_dw_get_power_state(port); } - if (cb) { - cb(port, ret, state, arg); - } return ret; } diff --git a/drivers/gpio/gpio_stm32.c b/drivers/gpio/gpio_stm32.c index 14e921198d3..76ff6a10740 100644 --- a/drivers/gpio/gpio_stm32.c +++ b/drivers/gpio/gpio_stm32.c @@ -626,10 +626,6 @@ static int gpio_stm32_pm_device_ctrl(const struct device *dev, } - if (cb) { - cb(dev, ret, state, arg); - } - return ret; } #endif /* CONFIG_PM_DEVICE */ diff --git a/drivers/i2c/i2c_cc13xx_cc26xx.c b/drivers/i2c/i2c_cc13xx_cc26xx.c index cf11e7d25c4..0af1103111a 100644 --- a/drivers/i2c/i2c_cc13xx_cc26xx.c +++ b/drivers/i2c/i2c_cc13xx_cc26xx.c @@ -386,10 +386,6 @@ static int i2c_cc13xx_cc26xx_pm_control(const struct device *dev, *state = get_dev_data(dev)->pm_state; } - if (cb) { - cb(dev, ret, state, arg); - } - return ret; } #endif /* CONFIG_PM_DEVICE */ diff --git a/drivers/i2c/i2c_nrfx_twi.c b/drivers/i2c/i2c_nrfx_twi.c index 0d8d6222940..155c31e3f67 100644 --- a/drivers/i2c/i2c_nrfx_twi.c +++ b/drivers/i2c/i2c_nrfx_twi.c @@ -263,10 +263,6 @@ static int twi_nrfx_pm_control(const struct device *dev, *state = get_dev_data(dev)->pm_state; } - if (cb) { - cb(dev, ret, state, arg); - } - return ret; } #endif /* CONFIG_PM_DEVICE */ diff --git a/drivers/i2c/i2c_nrfx_twim.c b/drivers/i2c/i2c_nrfx_twim.c index 11b0fb43a13..b48f6ad0661 100644 --- a/drivers/i2c/i2c_nrfx_twim.c +++ b/drivers/i2c/i2c_nrfx_twim.c @@ -303,10 +303,6 @@ static int twim_nrfx_pm_control(const struct device *dev, *state = get_dev_data(dev)->pm_state; } - if (cb) { - cb(dev, ret, state, arg); - } - return ret; } #endif /* CONFIG_PM_DEVICE */ diff --git a/drivers/interrupt_controller/intc_arcv2_irq_unit.c b/drivers/interrupt_controller/intc_arcv2_irq_unit.c index 98e8cdfa62d..898d5891613 100644 --- a/drivers/interrupt_controller/intc_arcv2_irq_unit.c +++ b/drivers/interrupt_controller/intc_arcv2_irq_unit.c @@ -212,10 +212,6 @@ static int arc_v2_irq_unit_device_ctrl(const struct device *dev, arch_irq_unlock(key); - if (cb) { - cb(dev, ret, state, arg); - } - return ret; } diff --git a/drivers/interrupt_controller/intc_ioapic.c b/drivers/interrupt_controller/intc_ioapic.c index 2366e8d441a..a311f4e96a6 100644 --- a/drivers/interrupt_controller/intc_ioapic.c +++ b/drivers/interrupt_controller/intc_ioapic.c @@ -346,10 +346,6 @@ static int ioapic_device_ctrl(const struct device *dev, *state = ioapic_device_power_state; } - if (cb) { - cb(dev, ret, state, arg); - } - return ret; } diff --git a/drivers/interrupt_controller/intc_loapic.c b/drivers/interrupt_controller/intc_loapic.c index a6a1a1f988a..c5bec56eb54 100644 --- a/drivers/interrupt_controller/intc_loapic.c +++ b/drivers/interrupt_controller/intc_loapic.c @@ -429,10 +429,6 @@ static int loapic_device_ctrl(const struct device *port, *state = loapic_device_power_state; } - if (cb) { - cb(port, ret, state, arg); - } - return ret; } diff --git a/drivers/led/led_pwm.c b/drivers/led/led_pwm.c index f0565f70fa8..507285398fa 100644 --- a/drivers/led/led_pwm.c +++ b/drivers/led/led_pwm.c @@ -196,10 +196,6 @@ static int led_pwm_pm_control(const struct device *dev, uint32_t ctrl_command, break; } - if (cb) { - cb(dev, err, state, arg); - } - return err; } diff --git a/drivers/pwm/pwm_nrfx.c b/drivers/pwm/pwm_nrfx.c index 9857cdebe90..b8ed2b9708f 100644 --- a/drivers/pwm/pwm_nrfx.c +++ b/drivers/pwm/pwm_nrfx.c @@ -354,9 +354,6 @@ static int pwm_nrfx_pm_control(const struct device *dev, int ret = 0; \ ret = pwm_nrfx_pm_control(dev, ctrl_command, state, \ ¤t_state); \ - if (cb) { \ - cb(dev, ret, state, arg); \ - } \ return ret; \ } #else diff --git a/drivers/sensor/apds9960/apds9960.c b/drivers/sensor/apds9960/apds9960.c index aac45d5f6fa..726b7a493a5 100644 --- a/drivers/sensor/apds9960/apds9960.c +++ b/drivers/sensor/apds9960/apds9960.c @@ -444,10 +444,6 @@ static int apds9960_device_ctrl(const struct device *dev, *state = PM_DEVICE_STATE_ACTIVE; } - if (cb) { - cb(dev, ret, state, arg); - } - return ret; } #endif diff --git a/drivers/sensor/bme280/bme280.c b/drivers/sensor/bme280/bme280.c index dd39cc8b282..63abee24727 100644 --- a/drivers/sensor/bme280/bme280.c +++ b/drivers/sensor/bme280/bme280.c @@ -431,10 +431,6 @@ int bme280_pm_ctrl(const struct device *dev, uint32_t ctrl_command, *state = data->pm_state; } - /* Invoke callback if any */ - if (cb) - cb(dev, ret, state, arg); - return ret; } #endif /* CONFIG_PM_DEVICE */ diff --git a/drivers/sensor/bmp388/bmp388.c b/drivers/sensor/bmp388/bmp388.c index 1f22ec512f1..776fb16c66d 100644 --- a/drivers/sensor/bmp388/bmp388.c +++ b/drivers/sensor/bmp388/bmp388.c @@ -600,9 +600,6 @@ static int bmp388_device_ctrl( *state = bmp388_get_power_state(dev); } - if (cb) { - cb(dev, ret, state, arg); - } return ret; } #endif /* CONFIG_PM_DEVICE */ diff --git a/drivers/sensor/fdc2x1x/fdc2x1x.c b/drivers/sensor/fdc2x1x/fdc2x1x.c index 0276a02b453..46a5380c39b 100644 --- a/drivers/sensor/fdc2x1x/fdc2x1x.c +++ b/drivers/sensor/fdc2x1x/fdc2x1x.c @@ -566,10 +566,6 @@ static int fdc2x1x_device_pm_ctrl(const struct device *dev, *state = data->pm_state; } - if (cb) { - cb(dev, ret, state, arg); - } - return ret; } #endif diff --git a/drivers/sensor/lis2mdl/lis2mdl.c b/drivers/sensor/lis2mdl/lis2mdl.c index 6c226bcb876..1cf4a8ced67 100644 --- a/drivers/sensor/lis2mdl/lis2mdl.c +++ b/drivers/sensor/lis2mdl/lis2mdl.c @@ -507,10 +507,6 @@ static int lis2mdl_pm_control(const struct device *dev, uint32_t ctrl_command, status = -EINVAL; } - if (cb) { - cb(dev, status, state, arg); - } - return status; } #endif /* CONFIG_PM_DEVICE */ diff --git a/drivers/sensor/qdec_nrfx/qdec_nrfx.c b/drivers/sensor/qdec_nrfx/qdec_nrfx.c index d61be1b3e1c..5ca1508f02a 100644 --- a/drivers/sensor/qdec_nrfx/qdec_nrfx.c +++ b/drivers/sensor/qdec_nrfx/qdec_nrfx.c @@ -289,10 +289,6 @@ static int qdec_nrfx_pm_control(const struct device *dev, break; } - if (cb) { - cb(dev, err, state, arg); - } - return err; } diff --git a/drivers/sensor/vcnl4040/vcnl4040.c b/drivers/sensor/vcnl4040/vcnl4040.c index 3fbeb3809e8..38c24ce8619 100644 --- a/drivers/sensor/vcnl4040/vcnl4040.c +++ b/drivers/sensor/vcnl4040/vcnl4040.c @@ -278,10 +278,6 @@ static int vcnl4040_device_ctrl(const struct device *dev, *state = PM_DEVICE_STATE_ACTIVE; } - if (cb) { - cb(dev, ret, state, arg); - } - return ret; } #endif diff --git a/drivers/serial/uart_cc13xx_cc26xx.c b/drivers/serial/uart_cc13xx_cc26xx.c index 94d6164681f..0dd6961ceb4 100644 --- a/drivers/serial/uart_cc13xx_cc26xx.c +++ b/drivers/serial/uart_cc13xx_cc26xx.c @@ -464,10 +464,6 @@ static int uart_cc13xx_cc26xx_pm_control(const struct device *dev, *state = get_dev_data(dev)->pm_state; } - if (cb) { - cb(dev, ret, state, arg); - } - return ret; } #endif /* CONFIG_PM_DEVICE */ diff --git a/drivers/serial/uart_npcx.c b/drivers/serial/uart_npcx.c index 3e51cf99c74..feb0da1aa13 100644 --- a/drivers/serial/uart_npcx.c +++ b/drivers/serial/uart_npcx.c @@ -488,9 +488,6 @@ static int uart_npcx_pm_control(const struct device *dev, uint32_t ctrl_command, ret = -EINVAL; } - if (cb != NULL) { - cb(dev, ret, state, arg); - } return ret; } #endif /* CONFIG_PM_DEVICE */ diff --git a/drivers/serial/uart_nrfx_uart.c b/drivers/serial/uart_nrfx_uart.c index d98471d6c59..2037db3ce6f 100644 --- a/drivers/serial/uart_nrfx_uart.c +++ b/drivers/serial/uart_nrfx_uart.c @@ -1176,10 +1176,6 @@ static int uart_nrfx_pm_control(const struct device *dev, *state = current_state; } - if (cb) { - cb(dev, 0, state, arg); - } - return 0; } #endif /* CONFIG_PM_DEVICE */ diff --git a/drivers/serial/uart_nrfx_uarte.c b/drivers/serial/uart_nrfx_uarte.c index 7ca67812229..979477251d9 100644 --- a/drivers/serial/uart_nrfx_uarte.c +++ b/drivers/serial/uart_nrfx_uarte.c @@ -1933,10 +1933,6 @@ static int uarte_nrfx_pm_control(const struct device *dev, *state = data->pm_state; } - if (cb) { - cb(dev, 0, state, arg); - } - return 0; } #endif /* CONFIG_PM_DEVICE */ diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c index dbe70eeb9b8..dbe9299531a 100644 --- a/drivers/serial/uart_stm32.c +++ b/drivers/serial/uart_stm32.c @@ -1481,10 +1481,6 @@ static int uart_stm32_pm_control(const struct device *dev, *state = data->pm_state; } - if (cb) { - cb(dev, 0, state, arg); - } - return 0; } #endif /* CONFIG_PM_DEVICE */ diff --git a/drivers/spi/spi_cc13xx_cc26xx.c b/drivers/spi/spi_cc13xx_cc26xx.c index 0e63c9ea2f4..df44fd87d8e 100644 --- a/drivers/spi/spi_cc13xx_cc26xx.c +++ b/drivers/spi/spi_cc13xx_cc26xx.c @@ -269,10 +269,6 @@ static int spi_cc13xx_cc26xx_pm_control(const struct device *dev, *state = get_dev_data(dev)->pm_state; } - if (cb) { - cb(dev, ret, state, arg); - } - return ret; } #endif /* CONFIG_PM_DEVICE */ diff --git a/drivers/spi/spi_nrfx_spi.c b/drivers/spi/spi_nrfx_spi.c index 4e86d6dcccd..0ea2a8927d3 100644 --- a/drivers/spi/spi_nrfx_spi.c +++ b/drivers/spi/spi_nrfx_spi.c @@ -323,10 +323,6 @@ static int spi_nrfx_pm_control(const struct device *dev, *state = data->pm_state; } - if (cb) { - cb(dev, ret, state, arg); - } - return ret; } #endif /* CONFIG_PM_DEVICE */ diff --git a/drivers/spi/spi_nrfx_spim.c b/drivers/spi/spi_nrfx_spim.c index fddcfb245a2..a1c103b8e9f 100644 --- a/drivers/spi/spi_nrfx_spim.c +++ b/drivers/spi/spi_nrfx_spim.c @@ -371,10 +371,6 @@ static int spim_nrfx_pm_control(const struct device *dev, *state = data->pm_state; } - if (cb) { - cb(dev, ret, state, arg); - } - return ret; } #endif /* CONFIG_PM_DEVICE */ diff --git a/samples/subsys/pm/device_pm/src/dummy_driver.c b/samples/subsys/pm/device_pm/src/dummy_driver.c index cf8cf9b57aa..6753c7b660b 100644 --- a/samples/subsys/pm/device_pm/src/dummy_driver.c +++ b/samples/subsys/pm/device_pm/src/dummy_driver.c @@ -129,8 +129,6 @@ static int dummy_device_pm_ctrl(const struct device *dev, } - cb(dev, ret, state, arg); - return ret; } diff --git a/samples/subsys/pm/device_pm/src/dummy_parent.c b/samples/subsys/pm/device_pm/src/dummy_parent.c index 287647bdf24..ad51e6ea0f1 100644 --- a/samples/subsys/pm/device_pm/src/dummy_parent.c +++ b/samples/subsys/pm/device_pm/src/dummy_parent.c @@ -69,7 +69,6 @@ static int dummy_parent_pm_ctrl(const struct device *dev, } - cb(dev, ret, state, arg); return ret; } diff --git a/tests/net/pm/src/main.c b/tests/net/pm/src/main.c index fee64469605..b3097bb1d62 100644 --- a/tests/net/pm/src/main.c +++ b/tests/net/pm/src/main.c @@ -42,9 +42,6 @@ static int fake_dev_pm_control(const struct device *dev, uint32_t command, } out: - if (cb) { - cb(dev, ret, state, arg); - } return ret; } diff --git a/tests/subsys/pm/device_runtime/src/dummy_driver.c b/tests/subsys/pm/device_runtime/src/dummy_driver.c index 745c254b428..d3fc641168b 100644 --- a/tests/subsys/pm/device_runtime/src/dummy_driver.c +++ b/tests/subsys/pm/device_runtime/src/dummy_driver.c @@ -75,10 +75,6 @@ static int dummy_device_pm_ctrl(const struct device *dev, } - if (cb) { - cb(dev, ret, state, arg); - } - return ret; } diff --git a/tests/subsys/pm/power_mgmt/src/dummy_driver.c b/tests/subsys/pm/power_mgmt/src/dummy_driver.c index 7b686e83a99..418bfc2dd17 100644 --- a/tests/subsys/pm/power_mgmt/src/dummy_driver.c +++ b/tests/subsys/pm/power_mgmt/src/dummy_driver.c @@ -61,10 +61,6 @@ static int dummy_device_pm_ctrl(const struct device *dev, } - if (cb) { - cb(dev, ret, state, arg); - } - return ret; }