diff options
| author | Olof Johansson <olof@lixom.net> | 2016-06-20 21:51:08 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-06-20 21:51:08 -0700 |
| commit | 5d82ae6ed1d127860958e6839e356cf09249cb57 (patch) | |
| tree | 208c43ee26659ccc567dff7802611c662e9ae3b8 | |
| parent | 6c8266009cfdacccc94da39493e2a88b9379b315 (diff) | |
| parent | 0a14d280e17ef3db75254439dfc83f1bc65fca6f (diff) | |
| download | op-kernel-dev-5d82ae6ed1d127860958e6839e356cf09249cb57.zip op-kernel-dev-5d82ae6ed1d127860958e6839e356cf09249cb57.tar.gz | |
Merge tag 'vexpress-fixes-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/cleanup
ARMv7 VExpress fixes for v4.8
Few fixes to remove build warnings with W=1
* tag 'vexpress-fixes-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
power: vexpress: make dev_attr_active static
ARM: vexpress/spc: fix missing include of spc.h
ARM: versatile: fix missing <plat/platsmp.h> include
ARM: vexpress/hotplug: fix missing core.h include
ARM: vexpress/spc: remove unused variable perf_stat_reg
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-vexpress/hotplug.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-vexpress/spc.c | 6 | ||||
| -rw-r--r-- | arch/arm/plat-versatile/platsmp.c | 2 | ||||
| -rw-r--r-- | drivers/power/reset/vexpress-poweroff.c | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/arch/arm/mach-vexpress/hotplug.c b/arch/arm/mach-vexpress/hotplug.c index f2fafc1..d8f1a05 100644 --- a/arch/arm/mach-vexpress/hotplug.c +++ b/arch/arm/mach-vexpress/hotplug.c @@ -15,6 +15,8 @@ #include <asm/smp_plat.h> #include <asm/cp15.h> +#include "core.h" + static inline void cpu_enter_lowpower(void) { unsigned int v; diff --git a/arch/arm/mach-vexpress/spc.c b/arch/arm/mach-vexpress/spc.c index 5766ce2..bc4ea5b 100644 --- a/arch/arm/mach-vexpress/spc.c +++ b/arch/arm/mach-vexpress/spc.c @@ -31,6 +31,8 @@ #include <asm/cacheflush.h> +#include "spc.h" + #define SPCLOG "vexpress-spc: " #define PERF_LVL_A15 0x00 @@ -319,17 +321,15 @@ static int ve_spc_waitforcompletion(int req_type) static int ve_spc_set_performance(int cluster, u32 freq) { - u32 perf_cfg_reg, perf_stat_reg; + u32 perf_cfg_reg; int ret, perf, req_type; if (cluster_is_a15(cluster)) { req_type = CA15_DVFS; perf_cfg_reg = PERF_LVL_A15; - perf_stat_reg = PERF_REQ_A15; } else { req_type = CA7_DVFS; perf_cfg_reg = PERF_LVL_A7; - perf_stat_reg = PERF_REQ_A7; } perf = ve_spc_find_performance_index(cluster, freq); diff --git a/arch/arm/plat-versatile/platsmp.c b/arch/arm/plat-versatile/platsmp.c index 53feb90..c236651 100644 --- a/arch/arm/plat-versatile/platsmp.c +++ b/arch/arm/plat-versatile/platsmp.c @@ -18,6 +18,8 @@ #include <asm/cacheflush.h> #include <asm/smp_plat.h> +#include <plat/platsmp.h> + /* * Write pen_release in a way that is guaranteed to be visible to all * observers, irrespective of whether they're taking part in coherency diff --git a/drivers/power/reset/vexpress-poweroff.c b/drivers/power/reset/vexpress-poweroff.c index 6a9bf70..102f95a 100644 --- a/drivers/power/reset/vexpress-poweroff.c +++ b/drivers/power/reset/vexpress-poweroff.c @@ -74,8 +74,8 @@ static ssize_t vexpress_reset_active_store(struct device *dev, return err ? err : count; } -DEVICE_ATTR(active, S_IRUGO | S_IWUSR, vexpress_reset_active_show, - vexpress_reset_active_store); +static DEVICE_ATTR(active, S_IRUGO | S_IWUSR, vexpress_reset_active_show, + vexpress_reset_active_store); enum vexpress_reset_func { FUNC_RESET, FUNC_SHUTDOWN, FUNC_REBOOT }; |
