UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branches 'pm-avs' and 'powercap' 

* pm-avs:
  MAINTAINERS: drop myself from PM AVS drivers
  PM: AVS: qcom-cpr: simplify the return expression of cpr_disable()

* powercap:
  powercap: include header to fix -Wmissing-prototypes
This commit is contained in:
Rafael J. Wysocki 2020-10-13 14:48:38 +02:00
parent 2cf9ba2905 bf23e1cd46 0061093515
commit 16641d81f9
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -5374,7 +5374,6 @@ F: include/linux/kobj*
F: lib/kobj* F: lib/kobj*
DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS) DRIVERS FOR ADAPTIVE VOLTAGE SCALING (AVS)
M: Kevin Hilman <khilman@kernel.org>
M: Nishanth Menon <nm@ti.com> M: Nishanth Menon <nm@ti.com>
L: linux-pm@vger.kernel.org L: linux-pm@vger.kernel.org
S: Maintained S: Maintained

8
drivers/power/avs/qcom-cpr.c
View File

@ -665,8 +665,6 @@ static int cpr_enable(struct cpr_drv *drv)
static int cpr_disable(struct cpr_drv *drv) static int cpr_disable(struct cpr_drv *drv)
{ {
int ret;
mutex_lock(&drv->lock); mutex_lock(&drv->lock);
if (cpr_is_allowed(drv)) { if (cpr_is_allowed(drv)) {
@ -676,11 +674,7 @@ static int cpr_disable(struct cpr_drv *drv)
mutex_unlock(&drv->lock); mutex_unlock(&drv->lock);
ret = regulator_disable(drv->vdd_apc); return regulator_disable(drv->vdd_apc);
if (ret)
return ret;
return 0;
} }
static int cpr_config(struct cpr_drv *drv) static int cpr_config(struct cpr_drv *drv)

1
drivers/powercap/idle_inject.c
View File

@ -43,6 +43,7 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/smpboot.h> #include <linux/smpboot.h>
#include <linux/idle_inject.h>
#include <uapi/linux/sched/types.h> #include <uapi/linux/sched/types.h>