V4L/DVB (7014): cx23885: dprintk macro cleanup

[safe/jmp/linux-2.6] / drivers / media / video / cx23885 / cx23885-dvb.c

diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 0f7e9df..3491036 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -33,16 +33,19 @@
 #include "s5h1409.h"
 #include "mt2131.h"
 #include "tda8290.h"
+#include "tda18271.h"
 #include "lgdt330x.h"
 #include "xc5000.h"
 #include "dvb-pll.h"
 #include "tuner-xc2028.h"
 #include "tuner-xc2028-types.h"
 
-static unsigned int debug = 0;
+static unsigned int debug;
 
-#define dprintk(level,fmt, arg...)     if (debug >= level) \
-       printk(KERN_DEBUG "%s: " fmt, dev->name, ## arg)
+#define dprintk(level, fmt, arg...)\
+       do { if (debug >= level)\
+               printk(KERN_DEBUG "%s/0: " fmt, dev->name, ## arg);\
+       } while (0)
 
 /* ------------------------------------------------------------------ */
 
@@ -178,6 +181,20 @@ static struct xc5000_config hauppauge_hvr1500q_tunerconfig = {
        .tuner_reset      = hauppauge_hvr1500q_tuner_reset
 };
 
+static struct tda829x_config tda829x_no_probe = {
+       .probe_tuner = TDA829X_DONT_PROBE,
+};
+
+static struct tda18271_std_map hauppauge_tda18271_std_map = {
+       .atsc_6   = { .if_freq = 5380, .std_bits = 0x1b },
+       .qam_6    = { .if_freq = 4000, .std_bits = 0x18 },
+};
+
+static struct tda18271_config hauppauge_tda18271_config = {
+       .std_map = &hauppauge_tda18271_std_map,
+       .gate    = TDA18271_GATE_ANALOG,
+};
+
 static int cx23885_hvr1500_xc3028_callback(void *ptr, int command, int arg)
 {
        struct cx23885_tsport *port = ptr;
@@ -240,7 +257,10 @@ static int dvb_register(struct cx23885_tsport *port)
                        if (port->dvb.frontend != NULL) {
                                dvb_attach(tda829x_attach, port->dvb.frontend,
                                           &dev->i2c_bus[1].i2c_adap, 0x42,
-                                          NULL);
+                                          &tda829x_no_probe);
+                               dvb_attach(tda18271_attach, port->dvb.frontend,
+                                          0x60, &dev->i2c_bus[1].i2c_adap,
+                                          &hauppauge_tda18271_config);
                        }
                        break;
                case 0: