From: Robert Jarzmik <robert.jarzmik@free.fr>
To: Mauro Carvalho Chehab <mchehab@kernel.org>,
Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
Jiri Kosina <trivial@kernel.org>,
Hans Verkuil <hverkuil@xs4all.nl>
Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
Robert Jarzmik <robert.jarzmik@free.fr>
Subject: [PATCH v5 06/13] media: platform: pxa_camera: introduce sensor_call
Date: Mon, 29 Aug 2016 19:55:51 +0200 [thread overview]
Message-ID: <1472493358-24618-7-git-send-email-robert.jarzmik@free.fr> (raw)
In-Reply-To: <1472493358-24618-1-git-send-email-robert.jarzmik@free.fr>
Introduce sensor_call(), which will be used for all sensor invocations.
This is a preparation move to v4l2 device conversion, ie. soc_camera
adherence removal.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
drivers/media/platform/soc_camera/pxa_camera.c | 27 ++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/drivers/media/platform/soc_camera/pxa_camera.c b/drivers/media/platform/soc_camera/pxa_camera.c
index 9d7c30cb1463..9870c53e0ec2 100644
--- a/drivers/media/platform/soc_camera/pxa_camera.c
+++ b/drivers/media/platform/soc_camera/pxa_camera.c
@@ -168,6 +168,9 @@
CICR0_PERRM | CICR0_QDM | CICR0_CDM | CICR0_SOFM | \
CICR0_EOFM | CICR0_FOM)
+#define sensor_call(cam, o, f, args...) \
+ v4l2_subdev_call(sd, o, f, ##args)
+
/*
* Structures
*/
@@ -731,7 +734,7 @@ static void pxa_camera_setup_cicr(struct soc_camera_device *icd,
struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
unsigned long dw, bpp;
u32 cicr0, cicr1, cicr2, cicr3, cicr4 = 0, y_skip_top;
- int ret = v4l2_subdev_call(sd, sensor, g_skip_top_lines, &y_skip_top);
+ int ret = sensor_call(pcdev, sensor, g_skip_top_lines, &y_skip_top);
if (ret < 0)
y_skip_top = 0;
@@ -1073,7 +1076,7 @@ static int pxa_camera_set_bus_param(struct soc_camera_device *icd)
if (ret < 0)
return ret;
- ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
+ ret = sensor_call(pcdev, video, g_mbus_config, &cfg);
if (!ret) {
common_flags = soc_mbus_config_compatible(&cfg,
bus_flags);
@@ -1117,7 +1120,7 @@ static int pxa_camera_set_bus_param(struct soc_camera_device *icd)
}
cfg.flags = common_flags;
- ret = v4l2_subdev_call(sd, video, s_mbus_config, &cfg);
+ ret = sensor_call(pcdev, video, s_mbus_config, &cfg);
if (ret < 0 && ret != -ENOIOCTLCMD) {
dev_dbg(icd->parent, "camera s_mbus_config(0x%lx) returned %d\n",
common_flags, ret);
@@ -1144,7 +1147,7 @@ static int pxa_camera_try_bus_param(struct soc_camera_device *icd,
if (ret < 0)
return ret;
- ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
+ ret = sensor_call(pcdev, video, g_mbus_config, &cfg);
if (!ret) {
common_flags = soc_mbus_config_compatible(&cfg,
bus_flags);
@@ -1195,7 +1198,7 @@ static int pxa_camera_get_formats(struct soc_camera_device *icd, unsigned int id
};
const struct soc_mbus_pixelfmt *fmt;
- ret = v4l2_subdev_call(sd, pad, enum_mbus_code, NULL, &code);
+ ret = sensor_call(pcdev, pad, enum_mbus_code, NULL, &code);
if (ret < 0)
/* No more formats */
return 0;
@@ -1297,7 +1300,7 @@ static int pxa_camera_set_crop(struct soc_camera_device *icd,
if (pcdev->platform_flags & PXA_CAMERA_PCLK_EN)
icd->sense = &sense;
- ret = v4l2_subdev_call(sd, video, s_crop, a);
+ ret = sensor_call(pcdev, video, s_crop, a);
icd->sense = NULL;
@@ -1307,7 +1310,7 @@ static int pxa_camera_set_crop(struct soc_camera_device *icd,
return ret;
}
- ret = v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt);
+ ret = sensor_call(pcdev, pad, get_fmt, NULL, &fmt);
if (ret < 0)
return ret;
@@ -1319,7 +1322,7 @@ static int pxa_camera_set_crop(struct soc_camera_device *icd,
v4l_bound_align_image(&mf->width, 48, 2048, 1,
&mf->height, 32, 2048, 0,
fourcc == V4L2_PIX_FMT_YUV422P ? 4 : 0);
- ret = v4l2_subdev_call(sd, pad, set_fmt, NULL, &fmt);
+ ret = sensor_call(pcdev, pad, set_fmt, NULL, &fmt);
if (ret < 0)
return ret;
@@ -1384,7 +1387,7 @@ static int pxa_camera_set_fmt(struct soc_camera_device *icd,
mf->colorspace = pix->colorspace;
mf->code = xlate->code;
- ret = v4l2_subdev_call(sd, pad, set_fmt, NULL, &format);
+ ret = sensor_call(pcdev, pad, set_fmt, NULL, &format);
if (mf->code != xlate->code)
return -EINVAL;
@@ -1459,7 +1462,7 @@ static int pxa_camera_try_fmt(struct soc_camera_device *icd,
mf->colorspace = pix->colorspace;
mf->code = xlate->code;
- ret = v4l2_subdev_call(sd, pad, set_fmt, &pad_cfg, &format);
+ ret = sensor_call(pcdev, pad, set_fmt, &pad_cfg, &format);
if (ret < 0)
return ret;
@@ -1517,7 +1520,7 @@ static int pxa_camera_suspend(struct device *dev)
if (pcdev->soc_host.icd) {
struct v4l2_subdev *sd = soc_camera_to_subdev(pcdev->soc_host.icd);
- ret = v4l2_subdev_call(sd, core, s_power, 0);
+ ret = sensor_call(pcdev, core, s_power, 0);
if (ret == -ENOIOCTLCMD)
ret = 0;
}
@@ -1539,7 +1542,7 @@ static int pxa_camera_resume(struct device *dev)
if (pcdev->soc_host.icd) {
struct v4l2_subdev *sd = soc_camera_to_subdev(pcdev->soc_host.icd);
- ret = v4l2_subdev_call(sd, core, s_power, 1);
+ ret = sensor_call(pcdev, core, s_power, 1);
if (ret == -ENOIOCTLCMD)
ret = 0;
}
--
2.1.4
next prev parent reply other threads:[~2016-08-29 17:57 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-29 17:55 [PATCH v5 00/13] pxa_camera transition to v4l2 standalone device Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 01/13] media: mt9m111: make a standalone v4l2 subdevice Robert Jarzmik
2016-08-30 8:55 ` Guennadi Liakhovetski
2016-08-30 15:57 ` Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 02/13] media: mt9m111: use only the SRGB colorspace Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 03/13] media: mt9m111: move mt9m111 out of soc_camera Robert Jarzmik
2016-08-30 8:37 ` Guennadi Liakhovetski
2016-08-29 17:55 ` [PATCH v5 04/13] media: platform: pxa_camera: convert to vb2 Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 05/13] media: platform: pxa_camera: trivial move of functions Robert Jarzmik
2016-08-29 17:55 ` Robert Jarzmik [this message]
2016-08-29 17:55 ` [PATCH v5 07/13] media: platform: pxa_camera: make printk consistent Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 08/13] media: platform: pxa_camera: add buffer sequencing Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 09/13] media: platform: pxa_camera: remove set_crop Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 10/13] media: platform: pxa_camera: make a standalone v4l2 device Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 11/13] media: platform: pxa_camera: add debug register access Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 12/13] media: platform: pxa_camera: change stop_streaming semantics Robert Jarzmik
2016-08-29 17:55 ` [PATCH v5 13/13] media: platform: pxa_camera: move pxa_camera out of soc_camera Robert Jarzmik
2016-09-05 12:40 ` [PATCH v5 00/13] pxa_camera transition to v4l2 standalone device Hans Verkuil
2016-09-06 8:49 ` Robert Jarzmik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1472493358-24618-7-git-send-email-robert.jarzmik@free.fr \
--to=robert.jarzmik@free.fr \
--cc=g.liakhovetski@gmx.de \
--cc=hverkuil@xs4all.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=trivial@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).