From 2e840e1daf1cc5cb1bdb4b7598fa86ce5ed8bd02 Mon Sep 17 00:00:00 2001 From: Jordan Crouse Date: Thu, 5 Dec 2019 12:25:07 -0700 Subject: [PATCH] PM / devfreq: Fix CONFIG check for cache HW monitor prototype Commit 2094bed75267 ("PM / devfreq: Add cache HW monitor governor") brought in the cache HW monitor with an incorrect check for CONFIG_DEVFREQ_GOV_QCOM_CACHE_HWMON that fails when the governor is built as a module. Change-Id: Ic0dedbadefc4885486660d32226e6dd89e006a11 Signed-off-by: Jordan Crouse --- drivers/devfreq/governor_bw_hwmon.h | 4 ++-- drivers/devfreq/governor_cache_hwmon.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/devfreq/governor_bw_hwmon.h b/drivers/devfreq/governor_bw_hwmon.h index 576dafbc651f..8cde9ce4c265 100644 --- a/drivers/devfreq/governor_bw_hwmon.h +++ b/drivers/devfreq/governor_bw_hwmon.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2014-2016, 2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2016, 2019-2020, The Linux Foundation. All rights reserved. */ #ifndef _GOVERNOR_BW_HWMON_H @@ -58,7 +58,7 @@ struct bw_hwmon { struct devfreq *df; }; -#ifdef CONFIG_DEVFREQ_GOV_QCOM_BW_HWMON +#if IS_ENABLED(CONFIG_DEVFREQ_GOV_QCOM_BW_HWMON) int register_bw_hwmon(struct device *dev, struct bw_hwmon *hwmon); int update_bw_hwmon(struct bw_hwmon *hwmon); int bw_hwmon_sample_end(struct bw_hwmon *hwmon); diff --git a/drivers/devfreq/governor_cache_hwmon.h b/drivers/devfreq/governor_cache_hwmon.h index 26e7313a841f..4d5aa3dc7918 100644 --- a/drivers/devfreq/governor_cache_hwmon.h +++ b/drivers/devfreq/governor_cache_hwmon.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2014, 2016, 2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2014, 2016, 2019-2020, The Linux Foundation. All rights reserved. */ #ifndef _GOVERNOR_CACHE_HWMON_H @@ -46,7 +46,7 @@ struct cache_hwmon { struct devfreq *df; }; -#ifdef CONFIG_DEVFREQ_GOV_QCOM_CACHE_HWMON +#if IS_ENABLED(CONFIG_DEVFREQ_GOV_QCOM_CACHE_HWMON) int register_cache_hwmon(struct device *dev, struct cache_hwmon *hwmon); int update_cache_hwmon(struct cache_hwmon *hwmon); #else