Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b654c62e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-cpufreq-fixes' and 'pm-core-fixes' 

* 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
parents bd37e022 d7737ce9

drivers/base/power/runtime.c

+5 −5
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ static int rpm_idle(struct device *dev, int rpmflags) 
	int (*callback)(struct device *);

	int retval;



	trace_rpm_idle(dev, rpmflags);

	trace_rpm_idle_rcuidle(dev, rpmflags);

	retval = rpm_check_suspend_allowed(dev);

	if (retval < 0)

		;	/* Conditions are wrong. */
@@ -337,7 +337,7 @@ static int rpm_idle(struct device *dev, int rpmflags) 
			dev->power.request_pending = true;

			queue_work(pm_wq, &dev->power.work);

		}

		trace_rpm_return_int(dev, _THIS_IP_, 0);

		trace_rpm_return_int_rcuidle(dev, _THIS_IP_, 0);

		return 0;

	}
@@ -352,7 +352,7 @@ static int rpm_idle(struct device *dev, int rpmflags) 
	wake_up_all(&dev->power.wait_queue);



 out:

	trace_rpm_return_int(dev, _THIS_IP_, retval);

	trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval);

	return retval ? retval : rpm_suspend(dev, rpmflags | RPM_AUTO);

}
@@ -601,7 +601,7 @@ static int rpm_resume(struct device *dev, int rpmflags) 
	struct device *parent = NULL;

	int retval = 0;



	trace_rpm_resume(dev, rpmflags);

	trace_rpm_resume_rcuidle(dev, rpmflags);



 repeat:

	if (dev->power.runtime_error)
@@ -764,7 +764,7 @@ static int rpm_resume(struct device *dev, int rpmflags) 
		spin_lock_irq(&dev->power.lock);

	}



	trace_rpm_return_int(dev, _THIS_IP_, retval);

	trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval);



	return retval;

}