Merge remote-tracking branch 'asoc/topic/qcom' into asoc-next

[deliverable/linux.git] / include / linux / pm_clock.h

diff --git a/include/linux/pm_clock.h b/include/linux/pm_clock.h
index 25266c600021462c8f809a22451231820caf1b6e..308d6044f153b3c2fcfd58b6d6ffa3f5d28fc65a 100644 (file)
--- a/include/linux/pm_clock.h
+++ b/include/linux/pm_clock.h
@@ -42,7 +42,9 @@ extern int pm_clk_create(struct device *dev);
 extern void pm_clk_destroy(struct device *dev);
 extern int pm_clk_add(struct device *dev, const char *con_id);
 extern int pm_clk_add_clk(struct device *dev, struct clk *clk);
+extern int of_pm_clk_add_clks(struct device *dev);
 extern void pm_clk_remove(struct device *dev, const char *con_id);
+extern void pm_clk_remove_clk(struct device *dev, struct clk *clk);
 extern int pm_clk_suspend(struct device *dev);
 extern int pm_clk_resume(struct device *dev);
 #else
@@ -69,11 +71,18 @@ static inline int pm_clk_add_clk(struct device *dev, struct clk *clk)
 {
        return -EINVAL;
 }
+static inline int of_pm_clk_add_clks(struct device *dev)
+{
+       return -EINVAL;
+}
 static inline void pm_clk_remove(struct device *dev, const char *con_id)
 {
 }
 #define pm_clk_suspend NULL
 #define pm_clk_resume  NULL
+static inline void pm_clk_remove_clk(struct device *dev, struct clk *clk)
+{
+}
 #endif
 
 #ifdef CONFIG_HAVE_CLK