Commit bb0365f4 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Hans Verkuil
Browse files

media: rkisp1: Discard pm_runtime_put() return value 



Printing error messages on pm_runtime_put() returning negative values
is not particularly useful.

Returning an error code from pm_runtime_put() merely means that it has
not queued up a work item to check whether or not the device can be
suspended and there are many perfectly valid situations in which that
can happen, like after writing "on" to the devices' runtime PM "control"
attribute in sysfs for one example.

Accordingly, update rkisp1_vb2_stop_streaming() to simply discard the
return value of pm_runtime_put().

This will facilitate a planned change of the pm_runtime_put() return
type to void in the future.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patch.msgid.link/2356323.iZASKD2KPV@rafael.j.wysocki


Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil+cisco@kernel.org>
parent 23e1bfef

drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c

+1 −4
Original line number Diff line number Diff line
@@ -1123,7 +1123,6 @@ static void rkisp1_vb2_stop_streaming(struct vb2_queue *queue) 
	struct rkisp1_capture *cap = queue->drv_priv;

	struct rkisp1_vdev_node *node = &cap->vnode;

	struct rkisp1_device *rkisp1 = cap->rkisp1;

	int ret;



	mutex_lock(&cap->rkisp1->stream_lock);
@@ -1132,9 +1131,7 @@ static void rkisp1_vb2_stop_streaming(struct vb2_queue *queue) 
	rkisp1_return_all_buffers(cap, VB2_BUF_STATE_ERROR);



	v4l2_pipeline_pm_put(&node->vdev.entity);

	ret = pm_runtime_put(rkisp1->dev);

	if (ret < 0)

		dev_err(rkisp1->dev, "power down failed error:%d\n", ret);

	pm_runtime_put(rkisp1->dev);



	rkisp1_dummy_buf_destroy(cap);