openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

greybus: camera: Return the result flags from the configure_streams response 

And return the response num_streams field through a pointer variable
instead of using the return value of the function as both an error code
and a positive number of streams, it makes the API more consistent.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Laurent Pinchart 2016-01-15 01:33:55 +02:00 committed by Greg Kroah-Hartman
parent 83ec628386
commit 4068487ce3
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/staging/greybus/camera.c
View File

@ -108,13 +108,14 @@ struct ap_csi_config_request {
} __packed; } __packed;
static int gb_camera_configure_streams(struct gb_camera *gcam, static int gb_camera_configure_streams(struct gb_camera *gcam,
unsigned int nstreams, unsigned int *num_streams,
unsigned int flags, unsigned int *flags,
struct gb_camera_stream_config *streams) struct gb_camera_stream_config *streams)
{ {
struct gb_camera_configure_streams_request *req; struct gb_camera_configure_streams_request *req;
struct gb_camera_configure_streams_response *resp; struct gb_camera_configure_streams_response *resp;
struct ap_csi_config_request csi_cfg; struct ap_csi_config_request csi_cfg;
unsigned int nstreams = *num_streams;
unsigned int i; unsigned int i;
size_t req_size; size_t req_size;
size_t resp_size; size_t resp_size;
@ -134,7 +135,7 @@ static int gb_camera_configure_streams(struct gb_camera *gcam,
} }
req->num_streams = nstreams; req->num_streams = nstreams;
req->flags = flags; req->flags = *flags;
req->padding = 0; req->padding = 0;
for (i = 0; i < nstreams; ++i) { for (i = 0; i < nstreams; ++i) {
@ -165,6 +166,8 @@ static int gb_camera_configure_streams(struct gb_camera *gcam,
goto done; goto done;
} }
*flags = resp->flags;
for (i = 0; i < nstreams; ++i) { for (i = 0; i < nstreams; ++i) {
struct gb_camera_stream_config_response *cfg = &resp->config[i]; struct gb_camera_stream_config_response *cfg = &resp->config[i];
@ -205,7 +208,8 @@ static int gb_camera_configure_streams(struct gb_camera *gcam,
gcam_err(gcam, "failed to %s the CSI transmitter\n", gcam_err(gcam, "failed to %s the CSI transmitter\n",
nstreams ? "start" : "stop"); nstreams ? "start" : "stop");
ret = resp->num_streams; *num_streams = resp->num_streams;
ret = 0;
done: done:
kfree(req); kfree(req);
@ -316,6 +320,7 @@ static int gb_camera_op_configure_streams(void *priv, unsigned int nstreams,
{ {
struct gb_camera *gcam = priv; struct gb_camera *gcam = priv;
struct gb_camera_stream_config *gb_streams; struct gb_camera_stream_config *gb_streams;
unsigned int flags = 0;
unsigned int i; unsigned int i;
int ret; int ret;
@ -333,7 +338,7 @@ static int gb_camera_op_configure_streams(void *priv, unsigned int nstreams,
gb_camera_mbus_to_gb(streams[i].pixel_code); gb_camera_mbus_to_gb(streams[i].pixel_code);
} }
ret = gb_camera_configure_streams(gcam, nstreams, 0, gb_streams); ret = gb_camera_configure_streams(gcam, &nstreams, &flags, gb_streams);
if (ret < 0) if (ret < 0)
goto done; goto done;
@ -455,12 +460,11 @@ static ssize_t gb_camera_debugfs_configure_streams(struct gb_camera *gcam,
goto done; goto done;
} }
ret = gb_camera_configure_streams(gcam, nstreams, flags, streams); ret = gb_camera_configure_streams(gcam, &nstreams, &flags, streams);
if (ret < 0) if (ret < 0)
goto done; goto done;
nstreams = ret; buffer->length = sprintf(buffer->data, "%u;%u;", nstreams, flags);
buffer->length = sprintf(buffer->data, "%u;", nstreams);
for (i = 0; i < nstreams; ++i) { for (i = 0; i < nstreams; ++i) {
struct gb_camera_stream_config *stream = &streams[i]; struct gb_camera_stream_config *stream = &streams[i];