s/generic_usercopy/video_usercopy/g

s/dvb_device_t/struct dvb_device/g

2 files changed, 24 insertions, 24 deletions

diff --git a/linux/drivers/media/dvb/av7110/av7110.c b/linux/drivers/media/dvb/av7110/av7110.c
index a5a2193c4..17cc22251 100644
--- a/linux/drivers/media/dvb/av7110/av7110.c
+++ b/linux/drivers/media/dvb/av7110/av7110.c
@@ -3118,7 +3118,7 @@ static int dvb_mmap(struct file* file, struct vm_area_struct *vma)
 
 static unsigned int dvb_audio_poll(struct file *file, poll_table *wait)
 {
-	dvb_device_t *dvbdev=(dvb_device_t *) file->private_data;
+	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
         av7110_t *av7110=(av7110_t *) dvbdev->priv;
         unsigned int mask=0;
 
@@ -3675,7 +3675,7 @@ ci_ll_read(ring_buffer_t *cibuf, struct file *file, char *buf, size_t count, lof
 static int 
 dvb_ca_open(struct inode *inode, struct file *file)
 {
-	dvb_device_t *dvbdev=(dvb_device_t *) file->private_data;
+	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
         av7110_t *av7110=(av7110_t *) dvbdev->priv;
         int err=dvb_generic_open(inode, file);
 
@@ -3688,7 +3688,7 @@ dvb_ca_open(struct inode *inode, struct file *file)
 static unsigned 
 int dvb_ca_poll(struct file *file, poll_table *wait)
 {
-	dvb_device_t *dvbdev=(dvb_device_t *) file->private_data;
+	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
         av7110_t *av7110=(av7110_t *) dvbdev->priv;
 
         unsigned int mask=0;
@@ -3717,7 +3717,7 @@ static int
 dvb_ca_ioctl(struct inode *inode, struct file *file, 
              unsigned int cmd, void *parg)
 {
-	dvb_device_t *dvbdev=(dvb_device_t *) file->private_data;
+	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
         av7110_t *av7110=(av7110_t *) dvbdev->priv;
         unsigned long arg=(unsigned long) parg;
 
@@ -3803,7 +3803,7 @@ static ssize_t
 dvb_ca_write(struct file *file, const char *buf, 
              size_t count, loff_t *ppos)
 {
-	dvb_device_t *dvbdev=(dvb_device_t *) file->private_data;
+	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
         av7110_t *av7110=(av7110_t *) dvbdev->priv;
         
         return ci_ll_write(&av7110->ci_wbuffer, file, buf, count, ppos);
@@ -3812,7 +3812,7 @@ dvb_ca_write(struct file *file, const char *buf,
 static ssize_t 
 dvb_ca_read(struct file *file, char *buf, size_t count, loff_t *ppos)
 {
-	dvb_device_t *dvbdev=(dvb_device_t *) file->private_data;
+	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
         av7110_t *av7110=(av7110_t *) dvbdev->priv;
 
         return ci_ll_read(&av7110->ci_rbuffer, file, buf, count, ppos);
@@ -3827,7 +3827,7 @@ dvb_ca_read(struct file *file, char *buf, size_t count, loff_t *ppos)
 
 static unsigned int dvb_video_poll(struct file *file, poll_table *wait)
 {
-	dvb_device_t *dvbdev=(dvb_device_t *) file->private_data;
+	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
         av7110_t *av7110=(av7110_t *) dvbdev->priv;
         unsigned int mask=0;
 
@@ -3849,7 +3849,7 @@ static ssize_t
 dvb_video_write(struct file *file, const char *buf, 
                 size_t count, loff_t *ppos)
 {
-	dvb_device_t *dvbdev=(dvb_device_t *) file->private_data;
+	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
         av7110_t *av7110=(av7110_t *) dvbdev->priv;
 
         if (av7110->videostate.stream_source!=VIDEO_SOURCE_MEMORY) 
@@ -3862,7 +3862,7 @@ static ssize_t
 dvb_audio_write(struct file *file, const char *buf, 
                 size_t count, loff_t *ppos)
 {
-	dvb_device_t *dvbdev=(dvb_device_t *) file->private_data;
+	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
         av7110_t *av7110=(av7110_t *) dvbdev->priv;
 
         if (av7110->audiostate.stream_source!=AUDIO_SOURCE_MEMORY) {
@@ -3899,7 +3899,7 @@ static int
 dvb_video_ioctl(struct inode *inode, struct file *file,
             unsigned int cmd, void *parg)
 {
-	dvb_device_t *dvbdev=(dvb_device_t *) file->private_data;
+	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
         av7110_t *av7110=(av7110_t *) dvbdev->priv;
         unsigned long arg=(unsigned long) parg;
         int ret=0;
@@ -4088,7 +4088,7 @@ static int
 dvb_audio_ioctl(struct inode *inode, struct file *file,
             unsigned int cmd, void *parg)
 {
-	dvb_device_t *dvbdev=(dvb_device_t *) file->private_data;
+	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
         av7110_t *av7110=(av7110_t *) dvbdev->priv;
         unsigned long arg=(unsigned long) parg;
         int ret=0;
@@ -4207,7 +4207,7 @@ static int
 dvb_osd_ioctl(struct inode *inode, struct file *file,
             unsigned int cmd, void *parg)
 {
-	dvb_device_t *dvbdev=(dvb_device_t *) file->private_data;
+	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
         av7110_t *av7110=(av7110_t *) dvbdev->priv;
 
 #ifdef CONFIG_DVB_AV7110_OSD
@@ -4219,7 +4219,7 @@ dvb_osd_ioctl(struct inode *inode, struct file *file,
 
 static int dvb_video_open(struct inode *inode, struct file *file)
 {
-	dvb_device_t *dvbdev=(dvb_device_t *) file->private_data;
+	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
         av7110_t *av7110=(av7110_t *) dvbdev->priv;
         int err;
 
@@ -4235,7 +4235,7 @@ static int dvb_video_open(struct inode *inode, struct file *file)
 
 static int dvb_video_release(struct inode *inode, struct file *file)
 {
-	dvb_device_t *dvbdev=(dvb_device_t *) file->private_data;
+	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
         av7110_t *av7110=(av7110_t *) dvbdev->priv;
 
         AV_Stop(av7110, RP_VIDEO);
@@ -4244,7 +4244,7 @@ static int dvb_video_release(struct inode *inode, struct file *file)
 
 static int dvb_audio_open(struct inode *inode, struct file *file)
 {
-	dvb_device_t *dvbdev=(dvb_device_t *) file->private_data;
+	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
         av7110_t *av7110=(av7110_t *) dvbdev->priv;
         int err=dvb_generic_open(inode, file);
 
@@ -4257,7 +4257,7 @@ static int dvb_audio_open(struct inode *inode, struct file *file)
 
 static int dvb_audio_release(struct inode *inode, struct file *file)
 {
-	dvb_device_t *dvbdev=(dvb_device_t *) file->private_data;
+	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
         av7110_t *av7110=(av7110_t *) dvbdev->priv;
         
         AV_Stop(av7110, RP_AUDIO);
@@ -4279,7 +4279,7 @@ static struct file_operations dvb_video_fops = {
 	.poll		= dvb_video_poll,
 };
 
-static dvb_device_t dvbdev_video = {
+static struct dvb_device dvbdev_video = {
 	.priv		= 0,
 	.users		= 1,
 	.writers	= 1,
@@ -4296,7 +4296,7 @@ static struct file_operations dvb_audio_fops = {
 	.poll		= dvb_audio_poll,
 };
 
-static dvb_device_t dvbdev_audio = {
+static struct dvb_device dvbdev_audio = {
 	.priv		= 0,
 	.users		= 1,
 	.writers	= 1,
@@ -4314,7 +4314,7 @@ static struct file_operations dvb_ca_fops = {
 	.poll		= dvb_ca_poll,
 };
 
-static dvb_device_t dvbdev_ca = {
+static struct dvb_device dvbdev_ca = {
 	.priv		= 0,
 	.users		= 1,
 	.writers	= 1,
@@ -4329,7 +4329,7 @@ static struct file_operations dvb_osd_fops = {
 	.release	= dvb_generic_release,
 };
 
-static dvb_device_t dvbdev_osd = {
+static struct dvb_device dvbdev_osd = {
 	.priv		= 0,
 	.users		= 1,
 	.writers	= 1,
diff --git a/linux/drivers/media/dvb/av7110/av7110.h b/linux/drivers/media/dvb/av7110/av7110.h
index 1337fad21..4d378c284 100644
--- a/linux/drivers/media/dvb/av7110/av7110.h
+++ b/linux/drivers/media/dvb/av7110/av7110.h
@@ -622,10 +622,10 @@ typedef struct av7110_s {
 
 
         dvb_adapter_t       *dvb_adapter;
-        dvb_device_t        *video_dev;
-        dvb_device_t        *audio_dev;
-        dvb_device_t        *ca_dev;
-        dvb_device_t        *osd_dev;
+        struct dvb_device        *video_dev;
+        struct dvb_device        *audio_dev;
+        struct dvb_device        *ca_dev;
+        struct dvb_device        *osd_dev;
 
         int                 dsp_dev;
 } av7110_t;