summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mmdc.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-01-10 13:19:05 +0100
committerShawn Guo <shawnguo@kernel.org>2017-01-23 07:55:08 +0100
commit7f1931b35f0909695543a8c12f72ccd2d20ff241 (patch)
treecea565bf2da0ab59f55262123d0431d2445fef1b /arch/arm/mach-imx/mmdc.c
parentARM: dts: imx6qdl-nitrogen6_som2: fix sgtl5000 pinctrl init (diff)
downloadlinux-7f1931b35f0909695543a8c12f72ccd2d20ff241.tar.xz
linux-7f1931b35f0909695543a8c12f72ccd2d20ff241.zip
ARM: imx: hide unused variable in #ifdef
A bugfix added a new local variable that is only used inside of an #ifdef section, and unused if CONFIG_PERF_EVENTS is disabled: arch/arm/mach-imx/mmdc.c:63:25: warning: 'cpuhp_mmdc_state' defined but not used [-Wunused-variable] This moves the variable down inside that same ifdef. Fixes: a051f220d6b9 ("ARM/imx/mmcd: Fix broken cpu hotplug handling") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Frank Li <Frank.Li@nxp.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/mach-imx/mmdc.c')
-rw-r--r--arch/arm/mach-imx/mmdc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mmdc.c b/arch/arm/mach-imx/mmdc.c
index 699157759120..c03bf28d8bbc 100644
--- a/arch/arm/mach-imx/mmdc.c
+++ b/arch/arm/mach-imx/mmdc.c
@@ -60,7 +60,6 @@
#define to_mmdc_pmu(p) container_of(p, struct mmdc_pmu, pmu)
-static enum cpuhp_state cpuhp_mmdc_state;
static int ddr_type;
struct fsl_mmdc_devtype_data {
@@ -82,6 +81,7 @@ static const struct of_device_id imx_mmdc_dt_ids[] = {
#ifdef CONFIG_PERF_EVENTS
+static enum cpuhp_state cpuhp_mmdc_state;
static DEFINE_IDA(mmdc_ida);
PMU_EVENT_ATTR_STRING(total-cycles, mmdc_pmu_total_cycles, "event=0x00")