V4L/DVB (6430): Convert tuner-xc2028 driver to the newer hybrid approach

This changeset converts tuner-xc2028 to the newer hybrid approach. It also
prevents creating twice the xc3028 private struct by both DVB and V4L parts.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 23 insertions, 1 deletions

diff --git a/drivers/media/video/tuner-xc2028.h b/drivers/media/video/tuner-xc2028.h
index 34ff4cba131a..d5a18a37d1c5 100644
--- a/drivers/media/video/tuner-xc2028.h
+++ b/drivers/media/video/tuner-xc2028.h
@@ -4,6 +4,11 @@
  * This code is placed under the terms of the GNU General Public License v2
  */
 
+#ifndef __TUNER_XC2028_H__
+#define __TUNER_XC2028_H__
+
+#include "dvb_frontend.h"
+
 /* xc2028 commands for callback */
 #define XC2028_TUNER_RESET      0
 #define XC2028_RESET_CLK        1
@@ -11,4 +16,21 @@
 struct dvb_frontend;
 struct i2c_client;
 
-int xc2028_attach(struct i2c_client *c, struct dvb_frontend *fe);
+#if defined(CONFIG_TUNER_XC2028) || (defined(CONFIG_TUNER_XC2028_MODULE) && defined(MODULE))
+int xc2028_attach(struct dvb_frontend *fe, struct i2c_adapter* i2c_adap,
+                  u8 i2c_addr, struct device *dev, void *video_dev,
+                  int (*tuner_callback) (void *dev, int command,int arg));
+
+#else
+static inline int xc2028_attach(struct dvb_frontend *fe,
+                  struct i2c_adapter* i2c_adap,
+                  u8 i2c_addr, struct device *dev, void *video_dev,
+                  int (*tuner_callback) (void *dev, int command,int arg))
+{
+        printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
+               __FUNCTION__);
+        return -EINVAL;
+}
+#endif
+
+#endif /* __TUNER_XC2028_H__ */