diff options
-rw-r--r-- | drivers/media/video/saa7127.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c index 2e8b6f2c6e34..798cfc7a7ef8 100644 --- a/drivers/media/video/saa7127.c +++ b/drivers/media/video/saa7127.c | |||
@@ -357,7 +357,7 @@ static int saa7127_write_inittab(struct i2c_client *client, | |||
357 | 357 | ||
358 | static int saa7127_set_vps(struct i2c_client *client, struct v4l2_sliced_vbi_data *data) | 358 | static int saa7127_set_vps(struct i2c_client *client, struct v4l2_sliced_vbi_data *data) |
359 | { | 359 | { |
360 | struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client); | 360 | struct saa7127_state *state = i2c_get_clientdata(client); |
361 | int enable = (data->line != 0); | 361 | int enable = (data->line != 0); |
362 | 362 | ||
363 | if (enable && (data->field != 0 || data->line != 16)) | 363 | if (enable && (data->field != 0 || data->line != 16)) |
@@ -391,7 +391,7 @@ static int saa7127_set_vps(struct i2c_client *client, struct v4l2_sliced_vbi_dat | |||
391 | 391 | ||
392 | static int saa7127_set_cc(struct i2c_client *client, struct v4l2_sliced_vbi_data *data) | 392 | static int saa7127_set_cc(struct i2c_client *client, struct v4l2_sliced_vbi_data *data) |
393 | { | 393 | { |
394 | struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client); | 394 | struct saa7127_state *state = i2c_get_clientdata(client); |
395 | u16 cc = data->data[0] << 8 | data->data[1]; | 395 | u16 cc = data->data[0] << 8 | data->data[1]; |
396 | int enable = (data->line != 0); | 396 | int enable = (data->line != 0); |
397 | 397 | ||
@@ -417,7 +417,7 @@ static int saa7127_set_cc(struct i2c_client *client, struct v4l2_sliced_vbi_data | |||
417 | 417 | ||
418 | static int saa7127_set_xds(struct i2c_client *client, struct v4l2_sliced_vbi_data *data) | 418 | static int saa7127_set_xds(struct i2c_client *client, struct v4l2_sliced_vbi_data *data) |
419 | { | 419 | { |
420 | struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client); | 420 | struct saa7127_state *state = i2c_get_clientdata(client); |
421 | u16 xds = data->data[1] << 8 | data->data[0]; | 421 | u16 xds = data->data[1] << 8 | data->data[0]; |
422 | int enable = (data->line != 0); | 422 | int enable = (data->line != 0); |
423 | 423 | ||
@@ -443,7 +443,7 @@ static int saa7127_set_xds(struct i2c_client *client, struct v4l2_sliced_vbi_dat | |||
443 | 443 | ||
444 | static int saa7127_set_wss(struct i2c_client *client, struct v4l2_sliced_vbi_data *data) | 444 | static int saa7127_set_wss(struct i2c_client *client, struct v4l2_sliced_vbi_data *data) |
445 | { | 445 | { |
446 | struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client); | 446 | struct saa7127_state *state = i2c_get_clientdata(client); |
447 | int enable = (data->line != 0); | 447 | int enable = (data->line != 0); |
448 | 448 | ||
449 | if (enable && (data->field != 0 || data->line != 23)) | 449 | if (enable && (data->field != 0 || data->line != 23)) |
@@ -467,7 +467,7 @@ static int saa7127_set_wss(struct i2c_client *client, struct v4l2_sliced_vbi_dat | |||
467 | 467 | ||
468 | static int saa7127_set_video_enable(struct i2c_client *client, int enable) | 468 | static int saa7127_set_video_enable(struct i2c_client *client, int enable) |
469 | { | 469 | { |
470 | struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client); | 470 | struct saa7127_state *state = i2c_get_clientdata(client); |
471 | 471 | ||
472 | if (enable) { | 472 | if (enable) { |
473 | saa7127_dbg("Enable Video Output\n"); | 473 | saa7127_dbg("Enable Video Output\n"); |
@@ -486,7 +486,7 @@ static int saa7127_set_video_enable(struct i2c_client *client, int enable) | |||
486 | 486 | ||
487 | static int saa7127_set_std(struct i2c_client *client, v4l2_std_id std) | 487 | static int saa7127_set_std(struct i2c_client *client, v4l2_std_id std) |
488 | { | 488 | { |
489 | struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client); | 489 | struct saa7127_state *state = i2c_get_clientdata(client); |
490 | const struct i2c_reg_value *inittab; | 490 | const struct i2c_reg_value *inittab; |
491 | 491 | ||
492 | if (std & V4L2_STD_525_60) { | 492 | if (std & V4L2_STD_525_60) { |
@@ -509,7 +509,7 @@ static int saa7127_set_std(struct i2c_client *client, v4l2_std_id std) | |||
509 | 509 | ||
510 | static int saa7127_set_output_type(struct i2c_client *client, int output) | 510 | static int saa7127_set_output_type(struct i2c_client *client, int output) |
511 | { | 511 | { |
512 | struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client); | 512 | struct saa7127_state *state = i2c_get_clientdata(client); |
513 | 513 | ||
514 | switch (output) { | 514 | switch (output) { |
515 | case SAA7127_OUTPUT_TYPE_RGB: | 515 | case SAA7127_OUTPUT_TYPE_RGB: |
@@ -558,7 +558,7 @@ static int saa7127_set_output_type(struct i2c_client *client, int output) | |||
558 | 558 | ||
559 | static int saa7127_set_input_type(struct i2c_client *client, int input) | 559 | static int saa7127_set_input_type(struct i2c_client *client, int input) |
560 | { | 560 | { |
561 | struct saa7127_state *state = (struct saa7127_state *)i2c_get_clientdata(client); | 561 | struct saa7127_state *state = i2c_get_clientdata(client); |
562 | 562 | ||
563 | switch (input) { | 563 | switch (input) { |
564 | case SAA7127_INPUT_TYPE_NORMAL: /* avia */ | 564 | case SAA7127_INPUT_TYPE_NORMAL: /* avia */ |