Merge tag 'ftracetest-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[cascardo/linux.git] / drivers / media / dvb-frontends / af9033.h

diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
index 539f4db..6ad22b6 100644 (file)
--- a/drivers/media/dvb-frontends/af9033.h
+++ b/drivers/media/dvb-frontends/af9033.h
@@ -24,12 +24,11 @@
 
 #include <linux/kconfig.h>
 
+/*
+ * I2C address (TODO: are these in 8-bit format?)
+ * 0x38, 0x3a, 0x3c, 0x3e
+ */
 struct af9033_config {
-       /*
-        * I2C address
-        */
-       u8 i2c_addr;
-
        /*
         * clock Hz
         * 12000000, 22000000, 24000000, 34000000, 32000000, 28000000, 26000000,
@@ -75,8 +74,23 @@ struct af9033_config {
         * input spectrum inversion
         */
        bool spec_inv;
-};
 
+       /*
+        *
+        */
+       bool dyn0_clk;
+
+       /*
+        * PID filter ops
+        */
+       struct af9033_ops *ops;
+
+       /*
+        * frontend
+        * returned by that driver
+        */
+       struct dvb_frontend **fe;
+};
 
 struct af9033_ops {
        int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
@@ -84,36 +98,4 @@ struct af9033_ops {
                          int onoff);
 };
 
-
-#if IS_ENABLED(CONFIG_DVB_AF9033)
-extern
-struct dvb_frontend *af9033_attach(const struct af9033_config *config,
-                                  struct i2c_adapter *i2c,
-                                  struct af9033_ops *ops);
-
-#else
-static inline
-struct dvb_frontend *af9033_attach(const struct af9033_config *config,
-                                  struct i2c_adapter *i2c,
-                                  struct af9033_ops *ops)
-{
-       pr_warn("%s: driver disabled by Kconfig\n", __func__);
-       return NULL;
-}
-
-static inline int af9033_pid_filter_ctrl(struct dvb_frontend *fe, int onoff)
-{
-       pr_warn("%s: driver disabled by Kconfig\n", __func__);
-       return -ENODEV;
-}
-
-static inline int af9033_pid_filter(struct dvb_frontend *fe, int index, u16 pid,
-       int onoff)
-{
-       pr_warn("%s: driver disabled by Kconfig\n", __func__);
-       return -ENODEV;
-}
-
-#endif
-
 #endif /* AF9033_H */