fix: update from upstream

GitHub Actions · GitHub Actions · commit 0022497bb18b · 2021-06-03T08:49:34.000Z
See https://github.com/nrfconnect/sdk-nrf/tree/a9c0be946b4a445c3933f78b294c9f488ffff2a7/applications/asset_tracker_v2
diff --git a/src/led/led_pwm.c b/src/led/led_pwm.c
@@ -162,8 +162,8 @@ int led_pwm_init(void)
 void led_pwm_start(void)
 {
 #if defined(CONFIG_PM_DEVICE)
-	int err = device_set_power_state(leds.pwm_dev, DEVICE_PM_ACTIVE_STATE,
-					 NULL, NULL);
+	int err = pm_device_state_set(leds.pwm_dev, PM_DEVICE_STATE_ACTIVE,
+				      NULL, NULL);
 	if (err) {
 		printk("PWM enable failed\n");
 	}
@@ -175,8 +175,8 @@ void led_pwm_stop(void)
 {
 	k_work_cancel_delayable_sync(&leds.work, &leds.work_sync);
 #if defined(CONFIG_PM_DEVICE)
-	int err = device_set_power_state(leds.pwm_dev, DEVICE_PM_SUSPEND_STATE,
-					 NULL, NULL);
+	int err = pm_device_state_set(leds.pwm_dev, PM_DEVICE_STATE_SUSPEND,
+				      NULL, NULL);
 	if (err) {
 		LOG_ERR("PWM disable failed");
 	}
diff --git a/src/modules/util_module.c b/src/modules/util_module.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr.h>
-#include <power/reboot.h>
+#include <sys/reboot.h>
 #include <logging/log.h>
 
 #define MODULE util_module

Original file line number	Diff line number	Diff line change
`@@ -162,8 +162,8 @@ int led_pwm_init(void)`
`162`	`162`	`void led_pwm_start(void)`
`163`	`163`	`{`
`164`	`164`	`#if defined(CONFIG_PM_DEVICE)`
`165`		`- int err = device_set_power_state(leds.pwm_dev, DEVICE_PM_ACTIVE_STATE,`
`166`		`- NULL, NULL);`
	`165`	`+ int err = pm_device_state_set(leds.pwm_dev, PM_DEVICE_STATE_ACTIVE,`
	`166`	`+ NULL, NULL);`
`167`	`167`	`if (err) {`
`168`	`168`	`printk("PWM enable failed\n");`
`169`	`169`	`}`
`@@ -175,8 +175,8 @@ void led_pwm_stop(void)`
`175`	`175`	`{`
`176`	`176`	`k_work_cancel_delayable_sync(&leds.work, &leds.work_sync);`
`177`	`177`	`#if defined(CONFIG_PM_DEVICE)`
`178`		`- int err = device_set_power_state(leds.pwm_dev, DEVICE_PM_SUSPEND_STATE,`
`179`		`- NULL, NULL);`
	`178`	`+ int err = pm_device_state_set(leds.pwm_dev, PM_DEVICE_STATE_SUSPEND,`
	`179`	`+ NULL, NULL);`
`180`	`180`	`if (err) {`
`181`	`181`	`LOG_ERR("PWM disable failed");`
`182`	`182`	`}`