diff options
| author | Guennadi Liakhovetski <lyakh@axis700.grange> | 2008-12-01 07:45:21 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 06:38:23 -0500 |
| commit | d8fac217c58f0101a351b9c8c80f1665bd9efef9 (patch) | |
| tree | 5b6b71e7f7cacf81620c046b5944134db2d70734 /drivers/media/video/mt9m111.c | |
| parent | 25c4d74ea6f07f2aaa3df537619680ba967043f5 (diff) | |
V4L/DVB (9788): soc-camera: simplify naming
We anyway don't follow the s_fmt_vid_cap / g_fmt_vid_cap / try_fmt_vid_cap
naming, and soc-camera is so far only about video capture, let's simplify
operation names a bit further. set_fmt_cap / try_fmt_cap wasn't a very good
choice too.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/mt9m111.c')
| -rw-r--r-- | drivers/media/video/mt9m111.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c index da0b2d553fd0..63c52c0b3e72 100644 --- a/drivers/media/video/mt9m111.c +++ b/drivers/media/video/mt9m111.c | |||
| @@ -452,8 +452,8 @@ static int mt9m111_set_pixfmt(struct soc_camera_device *icd, u32 pixfmt) | |||
| 452 | return ret; | 452 | return ret; |
| 453 | } | 453 | } |
| 454 | 454 | ||
| 455 | static int mt9m111_set_fmt_cap(struct soc_camera_device *icd, | 455 | static int mt9m111_set_fmt(struct soc_camera_device *icd, |
| 456 | __u32 pixfmt, struct v4l2_rect *rect) | 456 | __u32 pixfmt, struct v4l2_rect *rect) |
| 457 | { | 457 | { |
| 458 | struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd); | 458 | struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd); |
| 459 | int ret; | 459 | int ret; |
| @@ -473,8 +473,8 @@ static int mt9m111_set_fmt_cap(struct soc_camera_device *icd, | |||
| 473 | return ret; | 473 | return ret; |
| 474 | } | 474 | } |
| 475 | 475 | ||
| 476 | static int mt9m111_try_fmt_cap(struct soc_camera_device *icd, | 476 | static int mt9m111_try_fmt(struct soc_camera_device *icd, |
| 477 | struct v4l2_format *f) | 477 | struct v4l2_format *f) |
| 478 | { | 478 | { |
| 479 | if (f->fmt.pix.height > MT9M111_MAX_HEIGHT) | 479 | if (f->fmt.pix.height > MT9M111_MAX_HEIGHT) |
| 480 | f->fmt.pix.height = MT9M111_MAX_HEIGHT; | 480 | f->fmt.pix.height = MT9M111_MAX_HEIGHT; |
| @@ -597,8 +597,8 @@ static struct soc_camera_ops mt9m111_ops = { | |||
| 597 | .release = mt9m111_release, | 597 | .release = mt9m111_release, |
| 598 | .start_capture = mt9m111_start_capture, | 598 | .start_capture = mt9m111_start_capture, |
| 599 | .stop_capture = mt9m111_stop_capture, | 599 | .stop_capture = mt9m111_stop_capture, |
| 600 | .set_fmt_cap = mt9m111_set_fmt_cap, | 600 | .set_fmt = mt9m111_set_fmt, |
| 601 | .try_fmt_cap = mt9m111_try_fmt_cap, | 601 | .try_fmt = mt9m111_try_fmt, |
| 602 | .query_bus_param = mt9m111_query_bus_param, | 602 | .query_bus_param = mt9m111_query_bus_param, |
| 603 | .set_bus_param = mt9m111_set_bus_param, | 603 | .set_bus_param = mt9m111_set_bus_param, |
| 604 | .controls = mt9m111_controls, | 604 | .controls = mt9m111_controls, |