* pm-cpufreq-fixes: cpufreq: dt: Add terminate entry for of_device_id tables * pm-core-fixes: PM / runtime: Add _rcuidle suffix to allow rpm_idle() use from idle PM / runtime: Add _rcuidle suffix to allow rpm_resume() to be called from idle
Unified · Split
| @@ -301,7 +301,7 @@ static int rpm_idle(struct device *dev, int rpmflags) · 300 unmodified lines | |||
| 301 | int (*callback)(struct device *); | 301 | int (*callback)(struct device *); |
| 302 | int retval; | 302 | int retval; |
| 303 | 303 | ||
| 304 | trace_rpm_idle(dev, rpmflags); | 304 | trace_rpm_idle_rcuidle(dev, rpmflags); |
| 305 | retval = rpm_check_suspend_allowed(dev); | 305 | retval = rpm_check_suspend_allowed(dev); |
| 306 | if (retval < 0) | 306 | if (retval < 0) |
| 307 | ; /* Conditions are wrong. */ | 307 | ; /* Conditions are wrong. */ |
| @@ -337,7 +337,7 @@ static int rpm_idle(struct device *dev, int rpmflags) · 29 unmodified lines | |||
| 337 | dev->power.request_pending = true; | 337 | dev->power.request_pending = true; |
| 338 | queue_work(pm_wq, &dev->power.work); | 338 | queue_work(pm_wq, &dev->power.work); |
| 339 | } | 339 | } |
| 340 | trace_rpm_return_int(dev, _THIS_IP_, 0); | 340 | trace_rpm_return_int_rcuidle(dev, _THIS_IP_, 0); |
| 341 | return 0; | 341 | return 0; |
| 342 | } | 342 | } |
| 343 | 343 | ||
| @@ -352,7 +352,7 @@ static int rpm_idle(struct device *dev, int rpmflags) · 8 unmodified lines | |||
| 352 | wake_up_all(&dev->power.wait_queue); | 352 | wake_up_all(&dev->power.wait_queue); |
| 353 | 353 | ||
| 354 | out: | 354 | out: |
| 355 | trace_rpm_return_int(dev, _THIS_IP_, retval); | 355 | trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval); |
| 356 | return retval ? retval : rpm_suspend(dev, rpmflags | RPM_AUTO); | 356 | return retval ? retval : rpm_suspend(dev, rpmflags | RPM_AUTO); |
| 357 | } | 357 | } |
| 358 | 358 | ||
| @@ -601,7 +601,7 @@ static int rpm_resume(struct device *dev, int rpmflags) · 242 unmodified lines | |||
| 601 | struct device *parent = NULL; | 601 | struct device *parent = NULL; |
| 602 | int retval = 0; | 602 | int retval = 0; |
| 603 | 603 | ||
| 604 | trace_rpm_resume(dev, rpmflags); | 604 | trace_rpm_resume_rcuidle(dev, rpmflags); |
| 605 | 605 | ||
| 606 | repeat: | 606 | repeat: |
| 607 | if (dev->power.runtime_error) | 607 | if (dev->power.runtime_error) |
| @@ -764,7 +764,7 @@ static int rpm_resume(struct device *dev, int rpmflags) · 156 unmodified lines | |||
| 764 | spin_lock_irq(&dev->power.lock); | 764 | spin_lock_irq(&dev->power.lock); |
| 765 | } | 765 | } |
| 766 | 766 | ||
| 767 | trace_rpm_return_int(dev, _THIS_IP_, retval); | 767 | trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval); |
| 768 | 768 | ||
| 769 | return retval; | 769 | return retval; |
| 770 | } | 770 | } |