diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2018-05-28 17:41:47 +0200 |
|---|---|---|
| committer |   Will Deacon <will.deacon@arm.com> | 2018-05-29 16:38:16 +0100 |
| commit | 984e9cf1b9eaab08e4f1f082ce49ed2670e99d90 (patch) | |
| tree | 5ee3cf9d2e049b06af6670e9a66b791a7256dbdd /drivers/perf | |
| parent | drivers/perf: Remove ARM_SPE_PMU explicit PERF_EVENTS dependency (diff) | |
| download | linux-dev-984e9cf1b9eaab08e4f1f082ce49ed2670e99d90.tar.xz linux-dev-984e9cf1b9eaab08e4f1f082ce49ed2670e99d90.zip | |
drivers/bus: arm-cci: fix build warnings
When the arm-cci driver is enabled, but both CONFIG_ARM_CCI5xx_PMU and
CONFIG_ARM_CCI400_PMU are not, we get a warning about how parts of
the driver are never used:
drivers/perf/arm-cci.c:1454:29: error: 'cci_pmu_models' defined but not used [-Werror=unused-variable]
drivers/perf/arm-cci.c:693:16: error: 'cci_pmu_event_show' defined but not used [-Werror=unused-function]
drivers/perf/arm-cci.c:685:16: error: 'cci_pmu_format_show' defined but not used [-Werror=unused-function]
Marking all three functions as __maybe_unused avoids the warnings in
randconfig builds. I'm doing this lacking any ideas for a better fix.
Fixes: 3de6be7a3dd8 ("drivers/bus: Split Arm CCI driver")
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/perf')
| -rw-r--r-- | drivers/perf/arm-cci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/perf/arm-cci.c b/drivers/perf/arm-cci.c index e6fadc8e1178..0d09d8e669cd 100644 --- a/drivers/perf/arm-cci.c +++ b/drivers/perf/arm-cci.c @@ -120,9 +120,9 @@ enum cci_models { static void pmu_write_counters(struct cci_pmu *cci_pmu, unsigned long *mask); -static ssize_t cci_pmu_format_show(struct device *dev, +static ssize_t __maybe_unused cci_pmu_format_show(struct device *dev, struct device_attribute *attr, char *buf); -static ssize_t cci_pmu_event_show(struct device *dev, +static ssize_t __maybe_unused cci_pmu_event_show(struct device *dev, struct device_attribute *attr, char *buf); #define CCI_EXT_ATTR_ENTRY(_name, _func, _config) \ @@ -1451,7 +1451,7 @@ static int cci_pmu_offline_cpu(unsigned int cpu) return 0; } -static struct cci_pmu_model cci_pmu_models[] = { +static __maybe_unused struct cci_pmu_model cci_pmu_models[] = { #ifdef CONFIG_ARM_CCI400_PMU [CCI400_R0] = { .name = "CCI_400", |