pm: device: fsm_state -> state

Rename state variable.

Signed-off-by: Flavio Ceolin <flavio.ceolin@intel.com>
This commit is contained in:
Flavio Ceolin 2021-05-06 15:57:45 -07:00 committed by Anas Nashif
commit c7f5270a01
3 changed files with 12 additions and 12 deletions

View file

@ -96,7 +96,7 @@ struct pm_device {
/** Device usage count */ /** Device usage count */
atomic_t usage; atomic_t usage;
/** Device idle internal power state */ /** Device idle internal power state */
atomic_t fsm_state; atomic_t state;
/** Work object for asynchronous calls */ /** Work object for asynchronous calls */
struct k_work_delayable work; struct k_work_delayable work;
/** Event conditional var to listen to the sync request events */ /** Event conditional var to listen to the sync request events */

View file

@ -37,7 +37,7 @@ static int dummy_open(const struct device *dev)
(void) k_condvar_wait(&dev->pm->condvar, &wait_mutex, K_FOREVER); (void) k_condvar_wait(&dev->pm->condvar, &wait_mutex, K_FOREVER);
k_mutex_unlock(&wait_mutex); k_mutex_unlock(&wait_mutex);
if (atomic_get(&dev->pm->fsm_state) == PM_DEVICE_ACTIVE_STATE) { if (atomic_get(&dev->pm->state) == PM_DEVICE_ACTIVE_STATE) {
printk("Dummy device resumed\n"); printk("Dummy device resumed\n");
ret = 0; ret = 0;
} else { } else {

View file

@ -32,12 +32,12 @@ static void device_pm_callback(const struct device *dev,
{ {
__ASSERT(retval == 0, "Device set power state failed"); __ASSERT(retval == 0, "Device set power state failed");
/* Set the fsm_state */ /* Set the state */
if (*state == PM_DEVICE_ACTIVE_STATE) { if (*state == PM_DEVICE_ACTIVE_STATE) {
atomic_set(&dev->pm->fsm_state, atomic_set(&dev->pm->state,
PM_DEVICE_STATE_ACTIVE); PM_DEVICE_STATE_ACTIVE);
} else { } else {
atomic_set(&dev->pm->fsm_state, atomic_set(&dev->pm->state,
PM_DEVICE_STATE_SUSPENDED); PM_DEVICE_STATE_SUSPENDED);
} }
@ -55,11 +55,11 @@ static void pm_work_handler(struct k_work *work)
const struct device *dev = pm->dev; const struct device *dev = pm->dev;
int ret = 0; int ret = 0;
switch (atomic_get(&dev->pm->fsm_state)) { switch (atomic_get(&dev->pm->state)) {
case PM_DEVICE_STATE_ACTIVE: case PM_DEVICE_STATE_ACTIVE:
if ((atomic_get(&dev->pm->usage) == 0) && if ((atomic_get(&dev->pm->usage) == 0) &&
dev->pm->enable) { dev->pm->enable) {
atomic_set(&dev->pm->fsm_state, atomic_set(&dev->pm->state,
PM_DEVICE_STATE_SUSPENDING); PM_DEVICE_STATE_SUSPENDING);
ret = pm_device_state_set(dev, PM_DEVICE_SUSPEND_STATE, ret = pm_device_state_set(dev, PM_DEVICE_SUSPEND_STATE,
device_pm_callback, NULL); device_pm_callback, NULL);
@ -70,7 +70,7 @@ static void pm_work_handler(struct k_work *work)
case PM_DEVICE_STATE_SUSPENDED: case PM_DEVICE_STATE_SUSPENDED:
if ((atomic_get(&dev->pm->usage) > 0) || if ((atomic_get(&dev->pm->usage) > 0) ||
!dev->pm->enable) { !dev->pm->enable) {
atomic_set(&dev->pm->fsm_state, atomic_set(&dev->pm->state,
PM_DEVICE_STATE_RESUMING); PM_DEVICE_STATE_RESUMING);
ret = pm_device_state_set(dev, PM_DEVICE_ACTIVE_STATE, ret = pm_device_state_set(dev, PM_DEVICE_ACTIVE_STATE,
device_pm_callback, NULL); device_pm_callback, NULL);
@ -140,11 +140,11 @@ static int pm_device_request(const struct device *dev,
k_mutex_unlock(&request_mutex); k_mutex_unlock(&request_mutex);
/* /*
* dev->pm->fsm_state was set in device_pm_callback(). As the device * dev->pm->state was set in device_pm_callback(). As the device
* may not have been properly changed to the target_state or another * may not have been properly changed to the target_state or another
* thread we check it here before returning. * thread we check it here before returning.
*/ */
return target_state == atomic_get(&dev->pm->fsm_state) ? 0 : -EIO; return target_state == atomic_get(&dev->pm->state) ? 0 : -EIO;
} }
int pm_device_get(const struct device *dev) int pm_device_get(const struct device *dev)
@ -176,7 +176,7 @@ void pm_device_enable(const struct device *dev)
if (k_is_pre_kernel()) { if (k_is_pre_kernel()) {
dev->pm->dev = dev; dev->pm->dev = dev;
dev->pm->enable = true; dev->pm->enable = true;
atomic_set(&dev->pm->fsm_state, PM_DEVICE_STATE_SUSPENDED); atomic_set(&dev->pm->state, PM_DEVICE_STATE_SUSPENDED);
k_work_init_delayable(&dev->pm->work, pm_work_handler); k_work_init_delayable(&dev->pm->work, pm_work_handler);
return; return;
} }
@ -190,7 +190,7 @@ void pm_device_enable(const struct device *dev)
*/ */
if (!dev->pm->dev) { if (!dev->pm->dev) {
dev->pm->dev = dev; dev->pm->dev = dev;
atomic_set(&dev->pm->fsm_state, atomic_set(&dev->pm->state,
PM_DEVICE_STATE_SUSPENDED); PM_DEVICE_STATE_SUSPENDED);
k_work_init_delayable(&dev->pm->work, pm_work_handler); k_work_init_delayable(&dev->pm->work, pm_work_handler);
} else { } else {