Commit dbd7a2a9 authored by Rob Clark's avatar Rob Clark

PM / devfreq: Fix build issues with devfreq disabled

The existing no-op shims for when PM_DEVFREQ (or an individual governor)
only do half the job.  The governor specific config/tuning structs need
to be available to avoid compile errors in drivers using devfreq.

Fixes: 6563f60f ("drm/msm/gpu: Add devfreq tuning debugfs")
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Acked-by: default avatarMyungJoo Ham <myungjoo.ham@samsung.com>
Acked-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Patchwork: https://patchwork.freedesktop.org/patch/519801/
Link: https://lore.kernel.org/r/20230123153745.3185032-1-robdclark@gmail.com
parent 1d233b1c
...@@ -273,8 +273,8 @@ void devm_devfreq_unregister_notifier(struct device *dev, ...@@ -273,8 +273,8 @@ void devm_devfreq_unregister_notifier(struct device *dev,
struct devfreq *devfreq_get_devfreq_by_node(struct device_node *node); struct devfreq *devfreq_get_devfreq_by_node(struct device_node *node);
struct devfreq *devfreq_get_devfreq_by_phandle(struct device *dev, struct devfreq *devfreq_get_devfreq_by_phandle(struct device *dev,
const char *phandle_name, int index); const char *phandle_name, int index);
#endif /* CONFIG_PM_DEVFREQ */
#if IS_ENABLED(CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND)
/** /**
* struct devfreq_simple_ondemand_data - ``void *data`` fed to struct devfreq * struct devfreq_simple_ondemand_data - ``void *data`` fed to struct devfreq
* and devfreq_add_device * and devfreq_add_device
...@@ -292,9 +292,7 @@ struct devfreq_simple_ondemand_data { ...@@ -292,9 +292,7 @@ struct devfreq_simple_ondemand_data {
unsigned int upthreshold; unsigned int upthreshold;
unsigned int downdifferential; unsigned int downdifferential;
}; };
#endif
#if IS_ENABLED(CONFIG_DEVFREQ_GOV_PASSIVE)
enum devfreq_parent_dev_type { enum devfreq_parent_dev_type {
DEVFREQ_PARENT_DEV, DEVFREQ_PARENT_DEV,
CPUFREQ_PARENT_DEV, CPUFREQ_PARENT_DEV,
...@@ -337,9 +335,8 @@ struct devfreq_passive_data { ...@@ -337,9 +335,8 @@ struct devfreq_passive_data {
struct notifier_block nb; struct notifier_block nb;
struct list_head cpu_data_list; struct list_head cpu_data_list;
}; };
#endif
#else /* !CONFIG_PM_DEVFREQ */ #if !defined(CONFIG_PM_DEVFREQ)
static inline struct devfreq *devfreq_add_device(struct device *dev, static inline struct devfreq *devfreq_add_device(struct device *dev,
struct devfreq_dev_profile *profile, struct devfreq_dev_profile *profile,
const char *governor_name, const char *governor_name,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment