V4L/DVB: drivers/media: Remove unnecessary casts of private_data

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/IR/imon.c b/drivers/media/IR/imon.c
index 0195dd5ac078fa327d2a147f8409df730072986b..65c125e44e964ebd71ec15d955bd0a67035e7bb9 100644 (file)
--- a/drivers/media/IR/imon.c
+++ b/drivers/media/IR/imon.c
@@ -407,7 +407,7 @@ static int display_close(struct inode *inode, struct file *file)
        struct imon_context *ictx = NULL;
        int retval = 0;
 
-       ictx = (struct imon_context *)file->private_data;
+       ictx = file->private_data;
 
        if (!ictx) {
                err("%s: no context for device", __func__);
@@ -812,7 +812,7 @@ static ssize_t vfd_write(struct file *file, const char *buf,
        const unsigned char vfd_packet6[] = {
                0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF };
 
-       ictx = (struct imon_context *)file->private_data;
+       ictx = file->private_data;
        if (!ictx) {
                err("%s: no context for device", __func__);
                return -ENODEV;
@@ -896,7 +896,7 @@ static ssize_t lcd_write(struct file *file, const char *buf,
        int retval = 0;
        struct imon_context *ictx;
 
-       ictx = (struct imon_context *)file->private_data;
+       ictx = file->private_data;
        if (!ictx) {
                err("%s: no context for device", __func__);
                return -ENODEV;

diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c
index 74e2b56ecb5bb09b13135640872efb32445165b3..8224c301d0508c2bea379dc953b96947a2838166 100644 (file)
--- a/drivers/media/common/saa7146_vbi.c
+++ b/drivers/media/common/saa7146_vbi.c
@@ -375,7 +375,7 @@ static void vbi_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
 
 static int vbi_open(struct saa7146_dev *dev, struct file *file)
 {
-       struct saa7146_fh *fh = (struct saa7146_fh *)file->private_data;
+       struct saa7146_fh *fh = file->private_data;
 
        u32 arbtr_ctrl  = saa7146_read(dev, PCI_BT_V1);
        int ret = 0;
@@ -437,7 +437,7 @@ static int vbi_open(struct saa7146_dev *dev, struct file *file)
 
 static void vbi_close(struct saa7146_dev *dev, struct file *file)
 {
-       struct saa7146_fh *fh = (struct saa7146_fh *)file->private_data;
+       struct saa7146_fh *fh = file->private_data;
        struct saa7146_vv *vv = dev->vv_data;
        DEB_VBI(("dev:%p, fh:%p\n",dev,fh));
 

diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index b8b2c551a1e2d07aae91c983103c29fb52820080..a212a91a30f081ed59f80c4c0dd68562e7bdef00 100644 (file)
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -1370,7 +1370,7 @@ static void video_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
 
 static int video_open(struct saa7146_dev *dev, struct file *file)
 {
-       struct saa7146_fh *fh = (struct saa7146_fh *)file->private_data;
+       struct saa7146_fh *fh = file->private_data;
        struct saa7146_format *sfmt;
 
        fh->video_fmt.width = 384;
@@ -1394,7 +1394,7 @@ static int video_open(struct saa7146_dev *dev, struct file *file)
 
 static void video_close(struct saa7146_dev *dev, struct file *file)
 {
-       struct saa7146_fh *fh = (struct saa7146_fh *)file->private_data;
+       struct saa7146_fh *fh = file->private_data;
        struct saa7146_vv *vv = dev->vv_data;
        struct videobuf_queue *q = &fh->video_q;
        int err;

diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c
index 770243c720d2e3d06a5fb733ff05ba505c0eb88b..cf87051628458efd1035b172d22c40f3b3e00c8a 100644 (file)
--- a/drivers/media/dvb/bt8xx/dst_ca.c
+++ b/drivers/media/dvb/bt8xx/dst_ca.c
@@ -565,7 +565,7 @@ static long dst_ca_ioctl(struct file *file, unsigned int cmd, unsigned long ioct
        int result = 0;
 
        lock_kernel();
-       dvbdev = (struct dvb_device *)file->private_data;
+       dvbdev = file->private_data;
        state = (struct dst_state *)dvbdev->priv;
        p_ca_message = kmalloc(sizeof (struct ca_msg), GFP_KERNEL);
        p_ca_slot_info = kmalloc(sizeof (struct ca_slot_info), GFP_KERNEL);

diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c
index 20eaf38ba95976b4a46ae7c785d4e3b63c658071..d6792405f8d381070cfe5777883866164f06cc2d 100644 (file)
--- a/drivers/media/video/cx18/cx18-ioctl.c
+++ b/drivers/media/video/cx18/cx18-ioctl.c
@@ -1081,7 +1081,7 @@ long cx18_v4l2_ioctl(struct file *filp, unsigned int cmd,
                    unsigned long arg)
 {
        struct video_device *vfd = video_devdata(filp);
-       struct cx18_open_id *id = (struct cx18_open_id *)filp->private_data;
+       struct cx18_open_id *id = filp->private_data;
        struct cx18 *cx = id->cx;
        long res;
 

diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index 9209d5b87e04159c3293350d824e42da6af558d1..4f383cdf5296f3bd920a257a4e80a50519992319 100644 (file)
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -739,7 +739,7 @@ static int __devinit snd_cx88_create(struct snd_card *card,
 
        pci_set_master(pci);
 
-       chip = (snd_cx88_card_t *) card->private_data;
+       chip = card->private_data;
 
        core = cx88_core_get(pci);
        if (NULL == core) {

diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c
index c338f3f62e777abd0950d123c11338159a6788f0..4863a21b1f249963b949a304fc53666dbc394a50 100644 (file)
--- a/drivers/media/video/hdpvr/hdpvr-video.c
+++ b/drivers/media/video/hdpvr/hdpvr-video.c
@@ -394,7 +394,7 @@ err:
 
 static int hdpvr_release(struct file *file)
 {
-       struct hdpvr_fh         *fh  = (struct hdpvr_fh *)file->private_data;
+       struct hdpvr_fh         *fh  = file->private_data;
        struct hdpvr_device     *dev = fh->dev;
 
        if (!dev)
@@ -518,7 +518,7 @@ err:
 static unsigned int hdpvr_poll(struct file *filp, poll_table *wait)
 {
        struct hdpvr_buffer *buf = NULL;
-       struct hdpvr_fh *fh = (struct hdpvr_fh *)filp->private_data;
+       struct hdpvr_fh *fh = filp->private_data;
        struct hdpvr_device *dev = fh->dev;
        unsigned int mask = 0;
 

diff --git a/drivers/media/video/mem2mem_testdev.c b/drivers/media/video/mem2mem_testdev.c
index 10ddeccc70ebee17045ad57cd4f8af1248223b00..4525335f9bd416388484cbc5872ea0db3c3af768 100644 (file)
--- a/drivers/media/video/mem2mem_testdev.c
+++ b/drivers/media/video/mem2mem_testdev.c
@@ -903,14 +903,14 @@ static int m2mtest_release(struct file *file)
 static unsigned int m2mtest_poll(struct file *file,
                                 struct poll_table_struct *wait)
 {
-       struct m2mtest_ctx *ctx = (struct m2mtest_ctx *)file->private_data;
+       struct m2mtest_ctx *ctx = file->private_data;
 
        return v4l2_m2m_poll(file, ctx->m2m_ctx, wait);
 }
 
 static int m2mtest_mmap(struct file *file, struct vm_area_struct *vma)
 {
-       struct m2mtest_ctx *ctx = (struct m2mtest_ctx *)file->private_data;
+       struct m2mtest_ctx *ctx = file->private_data;
 
        return v4l2_m2m_mmap(file, ctx->m2m_ctx, vma);
 }

diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index 68b7e8d10dedbead29d53ca9c2b05ace642d951b..10460fd3ce3994c5865e11e4f990407b2b583c47 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -1080,7 +1080,7 @@ static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum)
        /* Card "creation" */
 
        card->private_free = snd_saa7134_free;
-       chip = (snd_card_saa7134_t *) card->private_data;
+       chip = card->private_data;
 
        spin_lock_init(&chip->lock);
        spin_lock_init(&chip->mixer_lock);

diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index 369ce06be03599a80ed0bd92d8e1ce14756840d6..86db32697b805dad926be84119082147f525e885 100644 (file)
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -516,7 +516,7 @@ static int uvc_v4l2_open(struct file *file)
 
 static int uvc_v4l2_release(struct file *file)
 {
-       struct uvc_fh *handle = (struct uvc_fh *)file->private_data;
+       struct uvc_fh *handle = file->private_data;
        struct uvc_streaming *stream = handle->stream;
 
        uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_release\n");
@@ -547,7 +547,7 @@ static int uvc_v4l2_release(struct file *file)
 static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
 {
        struct video_device *vdev = video_devdata(file);
-       struct uvc_fh *handle = (struct uvc_fh *)file->private_data;
+       struct uvc_fh *handle = file->private_data;
        struct uvc_video_chain *chain = handle->chain;
        struct uvc_streaming *stream = handle->stream;
        long ret = 0;
@@ -1116,7 +1116,7 @@ static const struct vm_operations_struct uvc_vm_ops = {
 
 static int uvc_v4l2_mmap(struct file *file, struct vm_area_struct *vma)
 {
-       struct uvc_fh *handle = (struct uvc_fh *)file->private_data;
+       struct uvc_fh *handle = file->private_data;
        struct uvc_streaming *stream = handle->stream;
        struct uvc_video_queue *queue = &stream->queue;
        struct uvc_buffer *uninitialized_var(buffer);
@@ -1171,7 +1171,7 @@ done:
 
 static unsigned int uvc_v4l2_poll(struct file *file, poll_table *wait)
 {
-       struct uvc_fh *handle = (struct uvc_fh *)file->private_data;
+       struct uvc_fh *handle = file->private_data;
        struct uvc_streaming *stream = handle->stream;
 
        uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_poll\n");