diff options
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core/dmxdev.c')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dmxdev.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.c b/linux/drivers/media/dvb/dvb-core/dmxdev.c index 3081b1925..c2fca219b 100644 --- a/linux/drivers/media/dvb/dvb-core/dmxdev.c +++ b/linux/drivers/media/dvb/dvb-core/dmxdev.c @@ -181,7 +181,7 @@ dvb_dmxdev_dvr_state_set(dmxdev_dvr_t *dmxdevdvr, int state) static int dvb_dvr_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; dmxdev_t *dmxdev=(dmxdev_t *) dvbdev->priv; dmx_frontend_t *front; @@ -230,7 +230,7 @@ static int dvb_dvr_open(struct inode *inode, struct file *file) static int dvb_dvr_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; dmxdev_t *dmxdev=(dmxdev_t *) dvbdev->priv; if (down_interruptible (&dmxdev->mutex)) @@ -258,7 +258,7 @@ static int dvb_dvr_release(struct inode *inode, struct file *file) static ssize_t dvb_dvr_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; dmxdev_t *dmxdev=(dmxdev_t *) dvbdev->priv; int ret; @@ -276,7 +276,7 @@ dvb_dvr_write(struct file *file, const char *buf, size_t count, loff_t *ppos) static ssize_t dvb_dvr_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; dmxdev_t *dmxdev=(dmxdev_t *) dvbdev->priv; int ret; @@ -694,7 +694,7 @@ dvb_dmxdev_filter_start(dmxdev_filter_t *dmxdevfilter) static int dvb_demux_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; dmxdev_t *dmxdev=(dmxdev_t *) dvbdev->priv; int i; dmxdev_filter_t *dmxdevfilter; @@ -919,7 +919,7 @@ static int dvb_demux_do_ioctl(struct inode *inode, struct file *file, static int dvb_demux_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { - return generic_usercopy(inode, file, cmd, arg, dvb_demux_do_ioctl); + return video_usercopy(inode, file, cmd, arg, dvb_demux_do_ioctl); } @@ -973,7 +973,7 @@ static struct file_operations dvb_demux_fops = { .poll = dvb_demux_poll, }; -static dvb_device_t dvbdev_demux = { +static struct dvb_device dvbdev_demux = { .priv = 0, .users = 1, .writers = 1, @@ -983,7 +983,7 @@ static dvb_device_t dvbdev_demux = { static int dvb_dvr_do_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; dmxdev_t *dmxdev=(dmxdev_t *) dvbdev->priv; int ret=0; @@ -1007,13 +1007,13 @@ static int dvb_dvr_do_ioctl(struct inode *inode, struct file *file, static int dvb_dvr_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { - return generic_usercopy(inode, file, cmd, arg, dvb_dvr_do_ioctl); + return video_usercopy(inode, file, cmd, arg, dvb_dvr_do_ioctl); } static unsigned int dvb_dvr_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; dmxdev_t *dmxdev=(dmxdev_t *) dvbdev->priv; dprintk ("function : %s\n", __FUNCTION__); @@ -1048,7 +1048,7 @@ static struct file_operations dvb_dvr_fops = { .poll =dvb_dvr_poll, }; -static dvb_device_t dvbdev_dvr = { +static struct dvb_device dvbdev_dvr = { .priv = 0, .users = 1, .writers = 1, |