From: Minghao Chi chi.minghao@zte.com.cn

Using 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.

Reported-by: Zeal Robot zealci@zte.com.cn Signed-off-by: Minghao Chi chi.minghao@zte.com.cn --- 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 e546c6431877..434aa5d9dd47 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) {