Skip to contentSkip to conversation

drivers/media/common: remove unnecessary casts of void *

PATCH In review H Hartley Sweeten 2 participants 3 messages Jan 8, 2010 – Jan 29, 2010 Media (V4L/DVB)

lore
Share & tools
lore

H Hartley Sweeten

author
#0 lore raw

PATCH 1/1 drivers/media/common: remove unnecessary casts of void *

drivers/media/common: Remove unnecessary casts of void *

void pointers do not need to be cast to other pointer types.

Signed-off-by H Hartley Sweeten <[email protected]>
Cc Michael Hunold <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>

---

 drivers/media/common/saa7146_vbi.c   |    6 +++---
 drivers/media/common/saa7146_video.c |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/media/common/saa7146_vbi.c +3 -3
index 74e2b56..301a795 100644
@@ -3,7 +3,7 @@
 static int vbi_pixel_to_capture = 720 * 2;
 
 static int vbi_workaround(struct saa7146_dev *dev)
-{
+{.remove_casts.hhs~
 	struct saa7146_vv *vv = dev->vv_data;
 
 	u32          *cpu;

@@ -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));
drivers/media/common/saa7146_video.c +2 -2
index becbaad..cfc8634 100644
@@ -1368,7 +1368,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;

@@ -1392,7 +1392,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;
#1 lore raw
Quoted 10 lines · H Hartley Sweeten

drivers/media/common: Remove unnecessary casts of void *

void pointers do not need to be cast to other pointer types.

drivers/media/common/saa7146_vbi.c +0 -0
index 74e2b56..301a795 100644

drivers/media/common/saa7146_vbi.c line 6

Quoted 5 lines
drivers/media/common/saa7146_vbi.c +1 -1
@@ -3,7 +3,7 @@
 static int vbi_pixel_to_capture = 720 * 2;
 
 static int vbi_workaround(struct saa7146_dev *dev)
-{
+{.remove_casts.hhs~

What's this? It seems that your patch got corrupted somehow.

Cheers,
Mauro

author
#2 lore raw
Quoted 13 lines · Mauro Carvalho Chehab
Quoted 12 lines · H Hartley Sweeten

drivers/media/common: Remove unnecessary casts of void *

void pointers do not need to be cast to other pointer types.

drivers/media/common/saa7146_vbi.c +0 -0
index 74e2b56..301a795 100644
@@ -3,7 +3,7 @@
 static int vbi_pixel_to_capture = 720 * 2;
Quoted 5 lines

drivers/media/common/saa7146_vbi.c line 6

Quoted 3 lines
drivers/media/common/saa7146_vbi.c +1 -1
 static int vbi_workaround(struct saa7146_dev *dev)
-{
+{.remove_casts.hhs~

What's this? It seems that your patch got corrupted somehow.

Oops... Not sure how that happened... Following is the corrected patch.

drivers/media/common: Remove unnecessary casts of void *

void pointers do not need to be cast to other pointer types.

Signed-off-by H Hartley Sweeten <[email protected]>
Cc Michael Hunold <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>

---

 drivers/media/common/saa7146_vbi.c   |    4 ++--
 drivers/media/common/saa7146_video.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/media/common/saa7146_vbi.c +2 -2
index 74e2b56..8224c30 100644
@@ -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));
drivers/media/common/saa7146_video.c +2 -2
index becbaad..cfc8634 100644
@@ -1368,7 +1368,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;

@@ -1392,7 +1392,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;