use pm_runtime_resume_and_get() to replace pm_runtime_get_sync and pm_runtime_put_noidle. this change is just to simplify the code, no actual functional changes.
Signed-off-by: Tian Tao tiantao6@hisilicon.com --- drivers/greybus/core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/greybus/core.c b/drivers/greybus/core.c index e546c64..434aa5d 100644 --- a/drivers/greybus/core.c +++ b/drivers/greybus/core.c @@ -174,11 +174,9 @@ static int greybus_probe(struct device *dev) if (!id) return -ENODEV;
- retval = pm_runtime_get_sync(&bundle->intf->dev); - if (retval < 0) { - pm_runtime_put_noidle(&bundle->intf->dev); + retval = pm_runtime_resume_and_get(&bundle->intf->dev); + if (retval < 0) return retval; - }
retval = gb_control_bundle_activate(bundle->intf->control, bundle->id); if (retval) {