diff options
| -rw-r--r-- | linux/drivers/media/video/saa7127.c | 16 | ||||
| -rw-r--r-- | v4l/ChangeLog | 15 |
2 files changed, 23 insertions, 8 deletions
diff --git a/linux/drivers/media/video/saa7127.c b/linux/drivers/media/video/saa7127.c index 1eabefc7d..7987d6030 100644 --- a/linux/drivers/media/video/saa7127.c +++ b/linux/drivers/media/video/saa7127.c @@ -364,7 +364,7 @@ static int saa7127_write_inittab(struct i2c_client *client, static int saa7127_set_vps(struct i2c_client *client, struct v4l2_sliced_vbi_data *data) { - struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client); + struct saa7127_state *state = i2c_get_clientdata(client); int enable = (data->line != 0); if (enable && (data->field != 0 || data->line != 16)) @@ -398,7 +398,7 @@ static int saa7127_set_vps(struct i2c_client *client, struct v4l2_sliced_vbi_dat static int saa7127_set_cc(struct i2c_client *client, struct v4l2_sliced_vbi_data *data) { - struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client); + struct saa7127_state *state = i2c_get_clientdata(client); u16 cc = data->data[0] << 8 | data->data[1]; int enable = (data->line != 0); @@ -424,7 +424,7 @@ static int saa7127_set_cc(struct i2c_client *client, struct v4l2_sliced_vbi_data static int saa7127_set_xds(struct i2c_client *client, struct v4l2_sliced_vbi_data *data) { - struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client); + struct saa7127_state *state = i2c_get_clientdata(client); u16 xds = data->data[1] << 8 | data->data[0]; int enable = (data->line != 0); @@ -450,7 +450,7 @@ static int saa7127_set_xds(struct i2c_client *client, struct v4l2_sliced_vbi_dat static int saa7127_set_wss(struct i2c_client *client, struct v4l2_sliced_vbi_data *data) { - struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client); + struct saa7127_state *state = i2c_get_clientdata(client); int enable = (data->line != 0); if (enable && (data->field != 0 || data->line != 23)) @@ -474,7 +474,7 @@ static int saa7127_set_wss(struct i2c_client *client, struct v4l2_sliced_vbi_dat static int saa7127_set_video_enable(struct i2c_client *client, int enable) { - struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client); + struct saa7127_state *state = i2c_get_clientdata(client); if (enable) { saa7127_dbg("Enable Video Output\n"); @@ -493,7 +493,7 @@ static int saa7127_set_video_enable(struct i2c_client *client, int enable) static int saa7127_set_std(struct i2c_client *client, v4l2_std_id std) { - struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client); + struct saa7127_state *state = i2c_get_clientdata(client); const struct i2c_reg_value *inittab; if (std & V4L2_STD_525_60) { @@ -516,7 +516,7 @@ static int saa7127_set_std(struct i2c_client *client, v4l2_std_id std) static int saa7127_set_output_type(struct i2c_client *client, int output) { - struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client); + struct saa7127_state *state = i2c_get_clientdata(client); switch (output) { case SAA7127_OUTPUT_TYPE_RGB: @@ -565,7 +565,7 @@ static int saa7127_set_output_type(struct i2c_client *client, int output) static int saa7127_set_input_type(struct i2c_client *client, int input) { - struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client); + struct saa7127_state *state = i2c_get_clientdata(client); switch (input) { case SAA7127_INPUT_TYPE_NORMAL: /* avia */ diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 60dabc1d9..51119e979 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,18 @@ +2005-11-11 01:23 mkrufky + + * ../linux/drivers/media/video/saa7127.c: (saa7127_set_vps), + (saa7127_set_cc), (saa7127_set_xds), (saa7127_set_wss), + (saa7127_set_video_enable), (saa7127_set_std), + (saa7127_set_output_type), (saa7127_set_input_type): + - Remove unneeded (and undesirable) casts. + + Cc: Hans Verkuil <hverkuil@xs4all.nl> + Cc: Chris Kennedy <c@groovy.org> + Cc: Kevin Thayer <nufan_wfk@yahoo.com> + Cc: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + Signed-off-by: Andrew Morton <akpm@osdl.org> + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-11-10 22:40 mkrufky * ../linux/drivers/media/video/saa7134/Kconfig: |