regmap: merge regmap_update_bits_check() into macro

[deliverable/linux.git] / include / linux / clk-provider.h

diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index c56988ac63f7801d5a93b004b80c20f7089bf2e3..1143e38555a40e893fb96da2fa1a48f53db50cbf 100644 (file)
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -31,6 +31,7 @@
 #define CLK_SET_RATE_NO_REPARENT BIT(7) /* don't re-parent on rate change */
 #define CLK_GET_ACCURACY_NOCACHE BIT(8) /* do not use the cached clk accuracy */
 #define CLK_RECALC_NEW_RATES   BIT(9) /* recalc rates after notifications */
+#define CLK_SET_RATE_UNGATE    BIT(10) /* clock needs to run to set rate */
 
 struct clk;
 struct clk_hw;
@@ -44,7 +45,7 @@ struct dentry;
  * @rate:              Requested clock rate. This field will be adjusted by
  *                     clock drivers according to hardware capabilities.
  * @min_rate:          Minimum rate imposed by clk users.
- * @max_rate:          Maximum rate a imposed by clk users.
+ * @max_rate:          Maximum rate imposed by clk users.
  * @best_parent_rate:  The best parent rate a parent can provide to fulfill the
  *                     requested constraints.
  * @best_parent_hw:    The most appropriate parent clock that fulfills the
@@ -715,8 +716,7 @@ static inline int of_clk_add_provider(struct device_node *np,
 {
        return 0;
 }
-#define of_clk_del_provider(np) \
-       { while (0); }
+static inline void of_clk_del_provider(struct device_node *np) {}
 static inline struct clk *of_clk_src_simple_get(
        struct of_phandle_args *clkspec, void *data)
 {
@@ -741,8 +741,7 @@ static inline const char *of_clk_get_parent_name(struct device_node *np,
 {
        return NULL;
 }
-#define of_clk_init(matches) \
-       { while (0); }
+static inline void of_clk_init(const struct of_device_id *matches) {}
 #endif /* CONFIG_OF */
 
 /*