aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/rj54n1cb0c.c
diff options
context:
space:
mode:
authorMárton Németh <nm127@freemail.hu>2010-02-24 15:13:29 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-17 23:44:09 -0400
commite26b31449142a18512b57dbea515af234992ba7c (patch)
treef3918a70f6ed82a04627517605d5377a047ad836 /drivers/media/video/rj54n1cb0c.c
parent02512fe33e9162713cd522937aabc81fcd97ad74 (diff)
V4L/DVB: The first two parameters of soc_camera_limit_side() are usually pointers to struct v4l2_rect elements. They are signed, so adjust the prototype accordingly
This will remove the following sparse warning (see "make C=1"): * incorrect type in argument 1 (different signedness) expected unsigned int *start got signed int *<noident> as well as a couple more signedness mismatches. Signed-off-by: Márton Németh <nm127@freemail.hu> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/rj54n1cb0c.c')
-rw-r--r--drivers/media/video/rj54n1cb0c.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/rj54n1cb0c.c b/drivers/media/video/rj54n1cb0c.c
index 9277194cd821..bbd9c11e2c5a 100644
--- a/drivers/media/video/rj54n1cb0c.c
+++ b/drivers/media/video/rj54n1cb0c.c
@@ -555,15 +555,15 @@ static int rj54n1_commit(struct i2c_client *client)
555 return ret; 555 return ret;
556} 556}
557 557
558static int rj54n1_sensor_scale(struct v4l2_subdev *sd, u32 *in_w, u32 *in_h, 558static int rj54n1_sensor_scale(struct v4l2_subdev *sd, s32 *in_w, s32 *in_h,
559 u32 *out_w, u32 *out_h); 559 s32 *out_w, s32 *out_h);
560 560
561static int rj54n1_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 561static int rj54n1_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
562{ 562{
563 struct i2c_client *client = sd->priv; 563 struct i2c_client *client = sd->priv;
564 struct rj54n1 *rj54n1 = to_rj54n1(client); 564 struct rj54n1 *rj54n1 = to_rj54n1(client);
565 struct v4l2_rect *rect = &a->c; 565 struct v4l2_rect *rect = &a->c;
566 unsigned int dummy = 0, output_w, output_h, 566 int dummy = 0, output_w, output_h,
567 input_w = rect->width, input_h = rect->height; 567 input_w = rect->width, input_h = rect->height;
568 int ret; 568 int ret;
569 569
@@ -577,7 +577,7 @@ static int rj54n1_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
577 output_w = (input_w * 1024 + rj54n1->resize / 2) / rj54n1->resize; 577 output_w = (input_w * 1024 + rj54n1->resize / 2) / rj54n1->resize;
578 output_h = (input_h * 1024 + rj54n1->resize / 2) / rj54n1->resize; 578 output_h = (input_h * 1024 + rj54n1->resize / 2) / rj54n1->resize;
579 579
580 dev_dbg(&client->dev, "Scaling for %ux%u : %u = %ux%u\n", 580 dev_dbg(&client->dev, "Scaling for %dx%d : %u = %dx%d\n",
581 input_w, input_h, rj54n1->resize, output_w, output_h); 581 input_w, input_h, rj54n1->resize, output_w, output_h);
582 582
583 ret = rj54n1_sensor_scale(sd, &input_w, &input_h, &output_w, &output_h); 583 ret = rj54n1_sensor_scale(sd, &input_w, &input_h, &output_w, &output_h);
@@ -638,8 +638,8 @@ static int rj54n1_g_fmt(struct v4l2_subdev *sd,
638 * the output one, updates the window sizes and returns an error or the resize 638 * the output one, updates the window sizes and returns an error or the resize
639 * coefficient on success. Note: we only use the "Fixed Scaling" on this camera. 639 * coefficient on success. Note: we only use the "Fixed Scaling" on this camera.
640 */ 640 */
641static int rj54n1_sensor_scale(struct v4l2_subdev *sd, u32 *in_w, u32 *in_h, 641static int rj54n1_sensor_scale(struct v4l2_subdev *sd, s32 *in_w, s32 *in_h,
642 u32 *out_w, u32 *out_h) 642 s32 *out_w, s32 *out_h)
643{ 643{
644 struct i2c_client *client = sd->priv; 644 struct i2c_client *client = sd->priv;
645 struct rj54n1 *rj54n1 = to_rj54n1(client); 645 struct rj54n1 *rj54n1 = to_rj54n1(client);
@@ -749,7 +749,7 @@ static int rj54n1_sensor_scale(struct v4l2_subdev *sd, u32 *in_w, u32 *in_h,
749 * improve the image quality or stability for larger frames (see comment 749 * improve the image quality or stability for larger frames (see comment
750 * above), but I didn't check the framerate. 750 * above), but I didn't check the framerate.
751 */ 751 */
752 skip = min(resize / 1024, (unsigned)15); 752 skip = min(resize / 1024, 15U);
753 753
754 inc_sel = 1 << skip; 754 inc_sel = 1 << skip;
755 755
@@ -819,7 +819,7 @@ static int rj54n1_sensor_scale(struct v4l2_subdev *sd, u32 *in_w, u32 *in_h,
819 *out_w = output_w; 819 *out_w = output_w;
820 *out_h = output_h; 820 *out_h = output_h;
821 821
822 dev_dbg(&client->dev, "Scaled for %ux%u : %u = %ux%u, skip %u\n", 822 dev_dbg(&client->dev, "Scaled for %dx%d : %u = %ux%u, skip %u\n",
823 *in_w, *in_h, resize, output_w, output_h, skip); 823 *in_w, *in_h, resize, output_w, output_h, skip);
824 824
825 return resize; 825 return resize;
@@ -1017,7 +1017,7 @@ static int rj54n1_s_fmt(struct v4l2_subdev *sd,
1017 struct i2c_client *client = sd->priv; 1017 struct i2c_client *client = sd->priv;
1018 struct rj54n1 *rj54n1 = to_rj54n1(client); 1018 struct rj54n1 *rj54n1 = to_rj54n1(client);
1019 const struct rj54n1_datafmt *fmt; 1019 const struct rj54n1_datafmt *fmt;
1020 unsigned int output_w, output_h, max_w, max_h, 1020 int output_w, output_h, max_w, max_h,
1021 input_w = rj54n1->rect.width, input_h = rj54n1->rect.height; 1021 input_w = rj54n1->rect.width, input_h = rj54n1->rect.height;
1022 int ret; 1022 int ret;
1023 1023