Merge tag 'mac80211-for-davem-2015-05-26' of git://git.kernel.org/pub/scm/linux/kerne...

[firefly-linux-kernel-4.4.55.git] / include / media / v4l2-clk.h

diff --git a/include/media/v4l2-clk.h b/include/media/v4l2-clk.h
index 0b36cc138304706e98e5993fc0014b4af9afda43..3ef6e3d5ed6c6f6eb90fa177f6eccc20ee7a9c83 100644 (file)
--- a/include/media/v4l2-clk.h
+++ b/include/media/v4l2-clk.h
@@ -22,14 +22,15 @@
 struct module;
 struct device;
 
+struct clk;
 struct v4l2_clk {
        struct list_head list;
        const struct v4l2_clk_ops *ops;
        const char *dev_id;
-       const char *id;
        int enable;
        struct mutex lock; /* Protect the enable count */
        atomic_t use_count;
+       struct clk *clk;
        void *priv;
 };
 
@@ -43,7 +44,7 @@ struct v4l2_clk_ops {
 
 struct v4l2_clk *v4l2_clk_register(const struct v4l2_clk_ops *ops,
                                   const char *dev_name,
-                                  const char *name, void *priv);
+                                  void *priv);
 void v4l2_clk_unregister(struct v4l2_clk *clk);
 struct v4l2_clk *v4l2_clk_get(struct device *dev, const char *id);
 void v4l2_clk_put(struct v4l2_clk *clk);
@@ -55,14 +56,13 @@ int v4l2_clk_set_rate(struct v4l2_clk *clk, unsigned long rate);
 struct module;
 
 struct v4l2_clk *__v4l2_clk_register_fixed(const char *dev_id,
-               const char *id, unsigned long rate, struct module *owner);
+                       unsigned long rate, struct module *owner);
 void v4l2_clk_unregister_fixed(struct v4l2_clk *clk);
 
 static inline struct v4l2_clk *v4l2_clk_register_fixed(const char *dev_id,
-                                                       const char *id,
                                                        unsigned long rate)
 {
-       return __v4l2_clk_register_fixed(dev_id, id, rate, THIS_MODULE);
+       return __v4l2_clk_register_fixed(dev_id, rate, THIS_MODULE);
 }
 
 #define v4l2_clk_name_i2c(name, size, adap, client) snprintf(name, size, \