Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 21:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

greybus: arche-apb-ctrl: Return immediately if in same state from state change fns

Browse Source 
Have a check inside all individual operational state change functions
to check whether device is in same state, and if yes, then return
immediately.

Testing Done: Tested on DB3.5 platform.

Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Vaibhav Hiremath 2016-02-22 17:27:26 +05:30 committed by Greg Kroah-Hartman
parent 25847ee7c9
commit c5e7cbaf3a
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/greybus/arche-apb-ctrl.c
View File

@ -67,7 +67,8 @@ static int coldboot_seq(struct platform_device *pdev)
struct arche_apb_ctrl_drvdata *apb = platform_get_drvdata(pdev);
int ret;
if (apb->init_disabled)
if (apb->init_disabled ||
apb->state == ARCHE_PLATFORM_STATE_ACTIVE)
return 0;
/* Hold APB in reset state */
@ -112,7 +113,8 @@ static int fw_flashing_seq(struct platform_device *pdev)
struct arche_apb_ctrl_drvdata *apb = platform_get_drvdata(pdev);
int ret;
if (apb->init_disabled)
if (apb->init_disabled ||
apb->state == ARCHE_PLATFORM_STATE_FW_FLASHING)
return 0;
ret = regulator_enable(apb->vcore);
@ -141,8 +143,9 @@ static int standby_boot_seq(struct platform_device *pdev)
if (apb->init_disabled)
return 0;
/* If it is in OFF state, then we do not want to change the state */
if (apb->state == ARCHE_PLATFORM_STATE_OFF)
/* Even if it is in OFF state, then we do not want to change the state */
if (apb->state == ARCHE_PLATFORM_STATE_STANDBY ||
apb->state == ARCHE_PLATFORM_STATE_OFF)
return 0;
/*
@ -162,7 +165,7 @@ static void poweroff_seq(struct platform_device *pdev)
{
struct arche_apb_ctrl_drvdata *apb = platform_get_drvdata(pdev);
if (apb->init_disabled)
if (apb->init_disabled || apb->state == ARCHE_PLATFORM_STATE_OFF)
return;
/* disable the clock */