aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMatthias Benesch <twoof7@freenet.de>2009-12-19 20:18:53 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 13:10:53 -0500
commit6ed36e6670635b162cc59e40cdb0fbcc51d59d1e (patch)
treeb4da826002d19794f65fc8ea21236c71816d514b /drivers
parent0027ebb73eff5bf0709f016edcad2be0605a3e4f (diff)
V4L/DVB: ngene: Additional clean-up
Remove and disable unnecessary code. Disable define ONE_ADAPTER. Signed-off-by: Matthias Benesch <twoof7@freenet.de> Signed-off-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/ngene/ngene-core.c3
-rw-r--r--drivers/media/dvb/ngene/ngene.h39
2 files changed, 3 insertions, 39 deletions
diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c
index 1fb16353708b..eb47b86902f9 100644
--- a/drivers/media/dvb/ngene/ngene-core.c
+++ b/drivers/media/dvb/ngene/ngene-core.c
@@ -2435,7 +2435,8 @@ static int init_channel(struct ngene_channel *chan)
2435#else 2435#else
2436 ret = dvb_register_adapter(&chan->dvb_adapter, "nGene", 2436 ret = dvb_register_adapter(&chan->dvb_adapter, "nGene",
2437 THIS_MODULE, 2437 THIS_MODULE,
2438 &chan->dev->pci_dev->dev); 2438 &chan->dev->pci_dev->dev,
2439 adapter_nr);
2439 if (ret < 0) 2440 if (ret < 0)
2440 return ret; 2441 return ret;
2441 adapter = &chan->dvb_adapter; 2442 adapter = &chan->dvb_adapter;
diff --git a/drivers/media/dvb/ngene/ngene.h b/drivers/media/dvb/ngene/ngene.h
index 74c6dab220a3..243f86c85897 100644
--- a/drivers/media/dvb/ngene/ngene.h
+++ b/drivers/media/dvb/ngene/ngene.h
@@ -24,7 +24,7 @@
24#ifndef _NGENE_H_ 24#ifndef _NGENE_H_
25#define _NGENE_H_ 25#define _NGENE_H_
26 26
27#define ONE_ADAPTER 27/*#define ONE_ADAPTER*/
28 28
29#include <linux/types.h> 29#include <linux/types.h>
30#include <linux/sched.h> 30#include <linux/sched.h>
@@ -794,38 +794,6 @@ struct ngene {
794 int prev_cmd; 794 int prev_cmd;
795}; 795};
796 796
797struct channel_info {
798 int io_type;
799#define NGENE_IO_NONE 0
800#define NGENE_IO_TV 1
801#define NGENE_IO_HDTV 2
802#define NGENE_IO_TSIN 4
803#define NGENE_IO_TSOUT 8
804#define NGENE_IO_AIN 16
805
806 void *fe_config;
807 void *tuner_config;
808
809 int (*demod_attach)(struct ngene_channel *);
810 int demod_type;
811#define NGENE_DEMOD_NONE 0
812#define NGENE_DEMOD_DRXD 1
813#define NGENE_DEMOD_STB0899 2
814#define NGENE_DEMOD_DRXH 3
815
816 int (*tuner_attach)(struct ngene_channel *);
817 int tuner_type;
818#define NGENE_TUNER_NONE 0
819#define NGENE_TUNER_MT2060 1
820
821 u8 demod;
822 u8 tuner;
823 u8 lnb;
824 u8 demoda;
825 u8 avf;
826 u8 msp;
827};
828
829struct ngene_info { 797struct ngene_info {
830 int type; 798 int type;
831#define NGENE_APP 0 799#define NGENE_APP 0
@@ -906,12 +874,7 @@ int ngene_command_imem_read(struct ngene *dev, u8 adr, u8 *data, int type);
906int ngene_command_imem_write(struct ngene *dev, u8 adr, u8 data, int type); 874int ngene_command_imem_write(struct ngene *dev, u8 adr, u8 data, int type);
907int ngene_stream_control(struct ngene *dev, u8 stream, u8 control, u8 mode, 875int ngene_stream_control(struct ngene *dev, u8 stream, u8 control, u8 mode,
908 u16 lines, u16 bpl, u16 vblines, u16 vbibpl); 876 u16 lines, u16 bpl, u16 vblines, u16 vbibpl);
909int ngene_v4l2_init(struct ngene_channel *chan);
910void ngene_v4l2_remove(struct ngene_channel *chan);
911int ngene_snd_exit(struct ngene_channel *chan);
912int ngene_snd_init(struct ngene_channel *chan);
913 877
914struct i2c_client *avf4910a_attach(struct i2c_adapter *adap, int addr);
915 878
916#endif 879#endif
917 880