pm: remove redundant callback usage
the device PM callback is not used anymore by the device PM subsystem,
so remove it from all drivers/tests using it.
Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
diff --git a/drivers/display/display_st7735r.c b/drivers/display/display_st7735r.c
index 130193a..a94993b 100644
--- a/drivers/display/display_st7735r.c
+++ b/drivers/display/display_st7735r.c
@@ -553,10 +553,6 @@
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 7ef4b44..9c710e4 100644
--- a/drivers/display/display_st7789v.c
+++ b/drivers/display/display_st7789v.c
@@ -433,9 +433,6 @@
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 df4535c..679f85a 100644
--- a/drivers/entropy/entropy_cc13xx_cc26xx.c
+++ b/drivers/entropy/entropy_cc13xx_cc26xx.c
@@ -312,10 +312,6 @@
*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 c22e237..e29e90c 100644
--- a/drivers/ethernet/eth_mcux.c
+++ b/drivers/ethernet/eth_mcux.c
@@ -228,9 +228,6 @@
}
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 eef0edf..0fedc01 100644
--- a/drivers/flash/spi_flash_at45.c
+++ b/drivers/flash/spi_flash_at45.c
@@ -670,10 +670,6 @@
*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 0eda266..e3e84d7 100644
--- a/drivers/gpio/gpio_dw.c
+++ b/drivers/gpio/gpio_dw.c
@@ -475,9 +475,6 @@
*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 14e9211..76ff6a1 100644
--- a/drivers/gpio/gpio_stm32.c
+++ b/drivers/gpio/gpio_stm32.c
@@ -626,10 +626,6 @@
}
- 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 cf11e7d..0af1103 100644
--- a/drivers/i2c/i2c_cc13xx_cc26xx.c
+++ b/drivers/i2c/i2c_cc13xx_cc26xx.c
@@ -386,10 +386,6 @@
*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 0d8d622..155c31e 100644
--- a/drivers/i2c/i2c_nrfx_twi.c
+++ b/drivers/i2c/i2c_nrfx_twi.c
@@ -263,10 +263,6 @@
*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 11b0fb4..b48f6ad 100644
--- a/drivers/i2c/i2c_nrfx_twim.c
+++ b/drivers/i2c/i2c_nrfx_twim.c
@@ -303,10 +303,6 @@
*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 98e8cdf..898d589 100644
--- a/drivers/interrupt_controller/intc_arcv2_irq_unit.c
+++ b/drivers/interrupt_controller/intc_arcv2_irq_unit.c
@@ -212,10 +212,6 @@
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 2366e8d..a311f4e 100644
--- a/drivers/interrupt_controller/intc_ioapic.c
+++ b/drivers/interrupt_controller/intc_ioapic.c
@@ -346,10 +346,6 @@
*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 a6a1a1f..c5bec56 100644
--- a/drivers/interrupt_controller/intc_loapic.c
+++ b/drivers/interrupt_controller/intc_loapic.c
@@ -429,10 +429,6 @@
*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 f0565f7..5072853 100644
--- a/drivers/led/led_pwm.c
+++ b/drivers/led/led_pwm.c
@@ -196,10 +196,6 @@
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 9857cde..b8ed2b9 100644
--- a/drivers/pwm/pwm_nrfx.c
+++ b/drivers/pwm/pwm_nrfx.c
@@ -354,9 +354,6 @@
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 aac45d5..726b7a4 100644
--- a/drivers/sensor/apds9960/apds9960.c
+++ b/drivers/sensor/apds9960/apds9960.c
@@ -444,10 +444,6 @@
*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 dd39cc8..63abee2 100644
--- a/drivers/sensor/bme280/bme280.c
+++ b/drivers/sensor/bme280/bme280.c
@@ -431,10 +431,6 @@
*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 1f22ec5..776fb16 100644
--- a/drivers/sensor/bmp388/bmp388.c
+++ b/drivers/sensor/bmp388/bmp388.c
@@ -600,9 +600,6 @@
*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 0276a02..46a5380 100644
--- a/drivers/sensor/fdc2x1x/fdc2x1x.c
+++ b/drivers/sensor/fdc2x1x/fdc2x1x.c
@@ -566,10 +566,6 @@
*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 6c226bc..1cf4a8c 100644
--- a/drivers/sensor/lis2mdl/lis2mdl.c
+++ b/drivers/sensor/lis2mdl/lis2mdl.c
@@ -507,10 +507,6 @@
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 d61be1b..5ca1508 100644
--- a/drivers/sensor/qdec_nrfx/qdec_nrfx.c
+++ b/drivers/sensor/qdec_nrfx/qdec_nrfx.c
@@ -289,10 +289,6 @@
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 3fbeb38..38c24ce 100644
--- a/drivers/sensor/vcnl4040/vcnl4040.c
+++ b/drivers/sensor/vcnl4040/vcnl4040.c
@@ -278,10 +278,6 @@
*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 94d6164..0dd6961 100644
--- a/drivers/serial/uart_cc13xx_cc26xx.c
+++ b/drivers/serial/uart_cc13xx_cc26xx.c
@@ -464,10 +464,6 @@
*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 3e51cf9..feb0da1 100644
--- a/drivers/serial/uart_npcx.c
+++ b/drivers/serial/uart_npcx.c
@@ -488,9 +488,6 @@
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 d98471d..2037db3 100644
--- a/drivers/serial/uart_nrfx_uart.c
+++ b/drivers/serial/uart_nrfx_uart.c
@@ -1176,10 +1176,6 @@
*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 7ca6781..9794772 100644
--- a/drivers/serial/uart_nrfx_uarte.c
+++ b/drivers/serial/uart_nrfx_uarte.c
@@ -1933,10 +1933,6 @@
*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 dbe70ee..dbe9299 100644
--- a/drivers/serial/uart_stm32.c
+++ b/drivers/serial/uart_stm32.c
@@ -1481,10 +1481,6 @@
*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 0e63c9e..df44fd8 100644
--- a/drivers/spi/spi_cc13xx_cc26xx.c
+++ b/drivers/spi/spi_cc13xx_cc26xx.c
@@ -269,10 +269,6 @@
*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 4e86d6d..0ea2a89 100644
--- a/drivers/spi/spi_nrfx_spi.c
+++ b/drivers/spi/spi_nrfx_spi.c
@@ -323,10 +323,6 @@
*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 fddcfb2..a1c103b 100644
--- a/drivers/spi/spi_nrfx_spim.c
+++ b/drivers/spi/spi_nrfx_spim.c
@@ -371,10 +371,6 @@
*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 cf8cf9b..6753c7b 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 @@
}
- 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 287647b..ad51e6e 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 @@
}
- cb(dev, ret, state, arg);
return ret;
}
diff --git a/tests/net/pm/src/main.c b/tests/net/pm/src/main.c
index fee6446..b3097bb 100644
--- a/tests/net/pm/src/main.c
+++ b/tests/net/pm/src/main.c
@@ -42,9 +42,6 @@
}
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 745c254..d3fc641 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 @@
}
- 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 7b686e8..418bfc2 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 @@
}
- if (cb) {
- cb(dev, ret, state, arg);
- }
-
return ret;
}
