From: Guennadi Liakhovetski Date: Sat, 4 Feb 2012 21:26:49 +0000 (+0100) Subject: PM / Domains: Provide a dummy dev_gpd_data() when generic domains are not used X-Git-Tag: upstream/snapshot3+hdmi~7950^2~6^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b4f617b1c2004332113b4a2c89dfb6e8029c987;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git PM / Domains: Provide a dummy dev_gpd_data() when generic domains are not used dev_gpd_data() is a generic macro, also useful for drivers. Hence it should be available also when CONFIG_PM_GENERIC_DOMAINS is not selected. OTOH, to_gpd_data() is so far unused outside of the generic PM domain code and does not seem to be very useful without CONFIG_PM_GENERIC_DOMAINS. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Rafael J. Wysocki --- diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index e3ff875..e76cc9a 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -101,12 +101,12 @@ struct generic_pm_domain_data { bool need_restore; }; +#ifdef CONFIG_PM_GENERIC_DOMAINS static inline struct generic_pm_domain_data *to_gpd_data(struct pm_domain_data *pdd) { return container_of(pdd, struct generic_pm_domain_data, base); } -#ifdef CONFIG_PM_GENERIC_DOMAINS static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev) { return to_gpd_data(dev->power.subsys_data->domain_data); @@ -207,6 +207,10 @@ static inline bool default_stop_ok(struct device *dev) return false; } #define pm_domain_always_on_gov NULL +static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev) +{ + return NULL; +} #endif static inline int pm_genpd_remove_callbacks(struct device *dev)