Merge branches 'pm-avs' and 'powercap' (16641d81) · Commits · 戴 / test

MAINTAINERS

+0 −1

Original line number	Diff line number	Diff line
		@@ -5374,7 +5374,6 @@ F: include/linux/kobj*
		F: lib/kobj*

		DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
		M: Kevin Hilman <khilman@kernel.org>
		M: Nishanth Menon <nm@ti.com>
		L: linux-pm@vger.kernel.org
		S: Maintained

+1 −7

Original line number	Diff line number	Diff line
		@@ -665,8 +665,6 @@ static int cpr_enable(struct cpr_drv *drv)

		static int cpr_disable(struct cpr_drv *drv)
		{
		int ret;

		mutex_lock(&drv->lock);

		if (cpr_is_allowed(drv)) {
		@@ -676,11 +674,7 @@ static int cpr_disable(struct cpr_drv *drv)

		mutex_unlock(&drv->lock);

		ret = regulator_disable(drv->vdd_apc);
		if (ret)
		return ret;

		return 0;
		return regulator_disable(drv->vdd_apc);
		}

		static int cpr_config(struct cpr_drv *drv)

+1 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@
		#include <linux/sched.h>
		#include <linux/slab.h>
		#include <linux/smpboot.h>
		#include <linux/idle_inject.h>

		#include <uapi/linux/sched/types.h>