pm: do not use deprecate Kconfig

nashif · galak · commit 24bd45b2876b · 2021-06-04T12:19:38.000-05:00
CONFIG_DEVICE_POWER_MANAGEMENT is deprecated, use CONFIG_PM_DEVICE
instead.

Signed-off-by: Anas Nashif &lt;anas.nashif@intel.com&gt;
diff --git a/drivers/display/display_st7735r.c b/drivers/display/display_st7735r.c
@@ -67,7 +67,7 @@ struct st7735r_data {
 	const struct device *reset_dev;
 	uint16_t x_offset;
 	uint16_t y_offset;
-#ifdef CONFIG_DEVICE_POWER_MANAGEMENT
+#ifdef CONFIG_PM_DEVICE
 	uint32_t pm_state;
 #endif
 };
@@ -475,7 +475,7 @@ static int st7735r_init(const struct device *dev)
 		}
 	}
 
-#ifdef CONFIG_DEVICE_POWER_MANAGEMENT
+#ifdef CONFIG_PM_DEVICE
 	data->pm_state = PM_DEVICE_STATE_ACTIVE;
 #endif
 
@@ -513,7 +513,7 @@ static int st7735r_init(const struct device *dev)
 	return 0;
 }
 
-#ifdef CONFIG_DEVICE_POWER_MANAGEMENT
+#ifdef CONFIG_PM_DEVICE
 static int st7735r_enter_sleep(struct st7735r_data *data)
 {
 	return st7735r_transmit(data, ST7735R_CMD_SLEEP_IN, NULL, 0);
@@ -558,7 +558,7 @@ static int st7735r_pm_control(const struct device *dev, uint32_t ctrl_command,
 
 	return ret;
 }
-#endif /* CONFIG_DEVICE_POWER_MANAGEMENT */
+#endif /* CONFIG_PM_DEVICE */
 
 static const struct display_driver_api st7735r_api = {
 	.blanking_on = st7735r_blanking_on,
diff --git a/drivers/sensor/bmp388/bmp388.c b/drivers/sensor/bmp388/bmp388.c
@@ -310,7 +310,7 @@ static int bmp388_attr_set(const struct device *dev,
 {
 	int ret;
 
-#ifdef CONFIG_DEVICE_POWER_MANAGEMENT
+#ifdef CONFIG_PM_DEVICE
 	struct bmp388_data *data = DEV_DATA(dev);
 
 	if (data->device_power_state != PM_DEVICE_STATE_ACTIVE) {
@@ -347,7 +347,7 @@ static int bmp388_sample_fetch(const struct device *dev,
 
 	__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL);
 
-#ifdef CONFIG_DEVICE_POWER_MANAGEMENT
+#ifdef CONFIG_PM_DEVICE
 	if (bmp388->device_power_state != PM_DEVICE_STATE_ACTIVE) {
 		return -EBUSY;
 	}
@@ -544,7 +544,7 @@ static int bmp388_get_calibration_data(const struct device *dev)
 	return 0;
 }
 
-#ifdef CONFIG_DEVICE_POWER_MANAGEMENT
+#ifdef CONFIG_PM_DEVICE
 static int bmp388_set_power_state(const struct device *dev,
 				  uint32_t power_state)
 {
@@ -606,7 +606,7 @@ static int bmp388_device_ctrl(
 	}
 	return ret;
 }
-#endif /* CONFIG_DEVICE_POWER_MANAGEMENT */
+#endif /* CONFIG_PM_DEVICE */
 
 static const struct sensor_driver_api bmp388_api = {
 	.attr_set = bmp388_attr_set,
@@ -671,7 +671,7 @@ static int bmp388_init(const struct device *dev)
 		return -ENODEV;
 	}
 
-#ifdef CONFIG_DEVICE_POWER_MANAGEMENT
+#ifdef CONFIG_PM_DEVICE
 	bmp388->device_power_state = PM_DEVICE_STATE_ACTIVE;
 #endif
 
diff --git a/drivers/sensor/bmp388/bmp388.h b/drivers/sensor/bmp388/bmp388.h
@@ -163,7 +163,7 @@ struct bmp388_data {
 	uint8_t osr_temp;
 	struct bmp388_cal_data cal;
 
-#ifdef CONFIG_DEVICE_POWER_MANAGEMENT
+#ifdef CONFIG_PM_DEVICE
 	uint32_t device_power_state;
 #endif
 
diff --git a/drivers/sensor/bmp388/bmp388_trigger.c b/drivers/sensor/bmp388/bmp388_trigger.c
@@ -91,7 +91,7 @@ int bmp388_trigger_set(
 {
 	struct bmp388_data *data = DEV_DATA(dev);
 
-#ifdef CONFIG_DEVICE_POWER_MANAGEMENT
+#ifdef CONFIG_PM_DEVICE
 	if (data->device_power_state != PM_DEVICE_STATE_ACTIVE) {
 		return -EBUSY;
 	}

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ struct st7735r_data {`
`67`	`67`	`const struct device *reset_dev;`
`68`	`68`	`uint16_t x_offset;`
`69`	`69`	`uint16_t y_offset;`
`70`		`-#ifdef CONFIG_DEVICE_POWER_MANAGEMENT`
	`70`	`+#ifdef CONFIG_PM_DEVICE`
`71`	`71`	`uint32_t pm_state;`
`72`	`72`	`#endif`
`73`	`73`	`};`
`@@ -475,7 +475,7 @@ static int st7735r_init(const struct device *dev)`
`475`	`475`	`}`
`476`	`476`	`}`
`477`	`477`
`478`		`-#ifdef CONFIG_DEVICE_POWER_MANAGEMENT`
	`478`	`+#ifdef CONFIG_PM_DEVICE`
`479`	`479`	`data->pm_state = PM_DEVICE_STATE_ACTIVE;`
`480`	`480`	`#endif`
`481`	`481`
`@@ -513,7 +513,7 @@ static int st7735r_init(const struct device *dev)`
`513`	`513`	`return 0;`
`514`	`514`	`}`
`515`	`515`
`516`		`-#ifdef CONFIG_DEVICE_POWER_MANAGEMENT`
	`516`	`+#ifdef CONFIG_PM_DEVICE`
`517`	`517`	`static int st7735r_enter_sleep(struct st7735r_data *data)`
`518`	`518`	`{`
`519`	`519`	`return st7735r_transmit(data, ST7735R_CMD_SLEEP_IN, NULL, 0);`
`@@ -558,7 +558,7 @@ static int st7735r_pm_control(const struct device *dev, uint32_t ctrl_command,`
`558`	`558`
`559`	`559`	`return ret;`
`560`	`560`	`}`
`561`		`-#endif /* CONFIG_DEVICE_POWER_MANAGEMENT */`
	`561`	`+#endif /* CONFIG_PM_DEVICE */`
`562`	`562`
`563`	`563`	`static const struct display_driver_api st7735r_api = {`
`564`	`564`	`.blanking_on = st7735r_blanking_on,`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ static int bmp388_attr_set(const struct device *dev,`
`310`	`310`	`{`
`311`	`311`	`int ret;`
`312`	`312`
`313`		`-#ifdef CONFIG_DEVICE_POWER_MANAGEMENT`
	`313`	`+#ifdef CONFIG_PM_DEVICE`
`314`	`314`	`struct bmp388_data *data = DEV_DATA(dev);`
`315`	`315`
`316`	`316`	`if (data->device_power_state != PM_DEVICE_STATE_ACTIVE) {`
`@@ -347,7 +347,7 @@ static int bmp388_sample_fetch(const struct device *dev,`
`347`	`347`
`348`	`348`	`__ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL);`
`349`	`349`
`350`		`-#ifdef CONFIG_DEVICE_POWER_MANAGEMENT`
	`350`	`+#ifdef CONFIG_PM_DEVICE`
`351`	`351`	`if (bmp388->device_power_state != PM_DEVICE_STATE_ACTIVE) {`
`352`	`352`	`return -EBUSY;`
`353`	`353`	`}`
`@@ -544,7 +544,7 @@ static int bmp388_get_calibration_data(const struct device *dev)`
`544`	`544`	`return 0;`
`545`	`545`	`}`
`546`	`546`
`547`		`-#ifdef CONFIG_DEVICE_POWER_MANAGEMENT`
	`547`	`+#ifdef CONFIG_PM_DEVICE`
`548`	`548`	`static int bmp388_set_power_state(const struct device *dev,`
`549`	`549`	`uint32_t power_state)`
`550`	`550`	`{`
`@@ -606,7 +606,7 @@ static int bmp388_device_ctrl(`
`606`	`606`	`}`
`607`	`607`	`return ret;`
`608`	`608`	`}`
`609`		`-#endif /* CONFIG_DEVICE_POWER_MANAGEMENT */`
	`609`	`+#endif /* CONFIG_PM_DEVICE */`
`610`	`610`
`611`	`611`	`static const struct sensor_driver_api bmp388_api = {`
`612`	`612`	`.attr_set = bmp388_attr_set,`
`@@ -671,7 +671,7 @@ static int bmp388_init(const struct device *dev)`
`671`	`671`	`return -ENODEV;`
`672`	`672`	`}`
`673`	`673`
`674`		`-#ifdef CONFIG_DEVICE_POWER_MANAGEMENT`
	`674`	`+#ifdef CONFIG_PM_DEVICE`
`675`	`675`	`bmp388->device_power_state = PM_DEVICE_STATE_ACTIVE;`
`676`	`676`	`#endif`
`677`	`677`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ int bmp388_trigger_set(`
`91`	`91`	`{`
`92`	`92`	`struct bmp388_data *data = DEV_DATA(dev);`
`93`	`93`
`94`		`-#ifdef CONFIG_DEVICE_POWER_MANAGEMENT`
	`94`	`+#ifdef CONFIG_PM_DEVICE`
`95`	`95`	`if (data->device_power_state != PM_DEVICE_STATE_ACTIVE) {`
`96`	`96`	`return -EBUSY;`
`97`	`97`	`}`