summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/cx25821/cx25821.h
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-04-13 10:50:18 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-04-16 22:57:27 +0200
commit18c73af6961c528fe5ce95eb510ef63582d47014 (patch)
tree828c7d0464fb3cb38e98ad06951c625432ec08e0 /drivers/media/pci/cx25821/cx25821.h
parent[media] cx25821: remove bogus radio/vbi/'video-ioctl' support (diff)
downloadlinux-18c73af6961c528fe5ce95eb510ef63582d47014.tar.xz
linux-18c73af6961c528fe5ce95eb510ef63582d47014.zip
[media] cx25821: remove unused fields, ioctls
Do some spring cleaning: - there are no board defines with tuners, so remove bogus tuner support. - tv standard handling has nothing to do with tuners, so keep that. - replace the deprecated current_norm by g_std. - querystd isn't implemented, so remove the ioctl. - remove a bunch of unused fields in cx25821.h Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/cx25821/cx25821.h')
-rw-r--r--drivers/media/pci/cx25821/cx25821.h18
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/media/pci/cx25821/cx25821.h b/drivers/media/pci/cx25821/cx25821.h
index 04c3cb0b6f42..fdeecdf09ef5 100644
--- a/drivers/media/pci/cx25821/cx25821.h
+++ b/drivers/media/pci/cx25821/cx25821.h
@@ -33,7 +33,6 @@
#include <media/v4l2-common.h>
#include <media/v4l2-device.h>
-#include <media/tuner.h>
#include <media/tveeprom.h>
#include <media/videobuf-dma-sg.h>
#include <media/videobuf-dvb.h>
@@ -43,7 +42,6 @@
#include "cx25821-medusa-reg.h"
#include "cx25821-sram.h"
#include "cx25821-audio.h"
-#include "media/cx2341x.h"
#include <linux/version.h>
#include <linux/mutex.h>
@@ -184,8 +182,6 @@ struct cx25821_board {
enum port porta;
enum port portb;
enum port portc;
- unsigned int tuner_type;
- unsigned char tuner_addr;
u32 clk_freq;
struct cx25821_input input[CX25821_NR_INPUT];
@@ -283,12 +279,7 @@ struct cx25821_dev {
/* Analog video */
u32 resources;
unsigned int input;
- u32 tvaudio;
v4l2_std_id tvnorm;
- unsigned int tuner_type;
- unsigned char tuner_addr;
- unsigned int videc_type;
- unsigned char videc_addr;
unsigned short _max_num_decoders;
/* Analog Audio Upstream */
@@ -314,8 +305,6 @@ struct cx25821_dev {
char *_audiofilename;
/* V4l */
- u32 freq;
-
spinlock_t slock;
/* Video Upstream */
@@ -363,13 +352,6 @@ struct cx25821_dev {
char *_filename_ch2;
char *_defaultname_ch2;
- /* MPEG Encoder ONLY settings */
- u32 cx23417_mailbox;
- struct cx2341x_mpeg_params mpeg_params;
- struct video_device *v4l_device;
- atomic_t v4l_reader_count;
- struct cx25821_tvnorm encodernorm;
-
u32 upstream_riscbuf_size;
u32 upstream_databuf_size;
u32 upstream_riscbuf_size_ch2;