Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=86184e06da4b71fc24ae9505ec60ce95c098d0de
Commit:     86184e06da4b71fc24ae9505ec60ce95c098d0de
Parent:     31bae4a62036a1d85aa9ee5864115dad2727336d
Author:     Steven Toth <[EMAIL PROTECTED]>
AuthorDate: Tue Sep 4 21:40:47 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 22:08:25 2007 -0300

    V4L/DVB (6172): cx23885: Removing duplicate tuner and demod definitions
    
    A number of Hauppauge boards share the same tuner and demod
    configurations. This patch removes duplicate structures.
    
    Signed-off-by: Steven Toth <[EMAIL PROTECTED]>
    Signed-off-by: Michael Krufky <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/video/cx23885/cx23885-dvb.c |   54 +++--------------------------
 1 files changed, 5 insertions(+), 49 deletions(-)

diff --git a/drivers/media/video/cx23885/cx23885-dvb.c 
b/drivers/media/video/cx23885/cx23885-dvb.c
index 58ae15a..291cc05 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -79,7 +79,7 @@ static struct videobuf_queue_ops dvb_qops = {
        .buf_release  = dvb_buf_release,
 };
 
-static struct s5h1409_config hauppauge_hvr1800lp_config = {
+static struct s5h1409_config hauppauge_generic_config = {
        .demod_address = 0x32 >> 1,
        .output_mode   = S5H1409_SERIAL_OUTPUT,
        .gpio          = S5H1409_GPIO_OFF,
@@ -88,33 +88,7 @@ static struct s5h1409_config hauppauge_hvr1800lp_config = {
        .status_mode   = S5H1409_DEMODLOCKING
 };
 
-static struct s5h1409_config hauppauge_hvr1800_config = {
-       .demod_address = 0x32 >> 1,
-       .output_mode   = S5H1409_SERIAL_OUTPUT,
-       .gpio          = S5H1409_GPIO_ON,
-       .if_freq       = 44000,
-       .inversion     = S5H1409_INVERSION_OFF,
-       .status_mode   = S5H1409_DEMODLOCKING
-};
-
-static struct s5h1409_config hauppauge_hvr1250_config = {
-       .demod_address = 0x32 >> 1,
-       .output_mode   = S5H1409_SERIAL_OUTPUT,
-       .gpio          = S5H1409_GPIO_ON,
-       .if_freq       = 44000,
-       .inversion     = S5H1409_INVERSION_OFF,
-       .status_mode   = S5H1409_DEMODLOCKING
-};
-
-static struct mt2131_config hauppauge_hvr1800lp_rev2_tunerconfig = {
-       0x61
-};
-
-static struct mt2131_config hauppauge_hvr1800_tunerconfig = {
-       0x61
-};
-
-static struct mt2131_config hauppauge_hvr1250_tunerconfig = {
+static struct mt2131_config hauppauge_generic_tunerconfig = {
        0x61
 };
 
@@ -128,33 +102,15 @@ static int dvb_register(struct cx23885_tsport *port)
        /* init frontend */
        switch (dev->board) {
        case CX23885_BOARD_HAUPPAUGE_HVR1250:
-               port->dvb.frontend = dvb_attach(s5h1409_attach,
-                                               &hauppauge_hvr1250_config,
-                                               &dev->i2c_bus[0].i2c_adap);
-               if (port->dvb.frontend != NULL) {
-                       dvb_attach(mt2131_attach, port->dvb.frontend,
-                                  &dev->i2c_bus[0].i2c_adap,
-                                  &hauppauge_hvr1250_tunerconfig, 0);
-               }
-               break;
-       case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
-               port->dvb.frontend = dvb_attach(s5h1409_attach,
-                                               &hauppauge_hvr1800lp_config,
-                                               &dev->i2c_bus[0].i2c_adap);
-               if (port->dvb.frontend != NULL) {
-                       dvb_attach(mt2131_attach, port->dvb.frontend,
-                                  &dev->i2c_bus[0].i2c_adap,
-                                  &hauppauge_hvr1800lp_rev2_tunerconfig, 0);
-               }
-               break;
        case CX23885_BOARD_HAUPPAUGE_HVR1800:
+       case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
                port->dvb.frontend = dvb_attach(s5h1409_attach,
-                                               &hauppauge_hvr1800_config,
+                                               &hauppauge_generic_config,
                                                &dev->i2c_bus[0].i2c_adap);
                if (port->dvb.frontend != NULL) {
                        dvb_attach(mt2131_attach, port->dvb.frontend,
                                   &dev->i2c_bus[0].i2c_adap,
-                                  &hauppauge_hvr1800_tunerconfig, 0);
+                                  &hauppauge_generic_tunerconfig, 0);
                }
                break;
        default:
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to