Commit 0c8bc934 authored by Dafna Hirschfeld's avatar Dafna Hirschfeld Committed by Mauro Carvalho Chehab

media: staging: rkisp1: fix dev param for dev_* debugs

In some debug prints a wrong 'dev' argument is used
for the dev_(dbg/err/warn), this cause a prefix
"(NULL device *)" to the prints.
In some prints the 'dev' of the sensor subdevice is used
which is also wrong.
Signed-off-by: default avatarDafna Hirschfeld <dafna.hirschfeld@collabora.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
[hverkuil-cisco@xs4all.nl: s/in subdev/in sensor subdev/ as per Laurent's comment]
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 3bee8616
...@@ -129,7 +129,7 @@ static int rkisp1_create_links(struct rkisp1_device *rkisp1) ...@@ -129,7 +129,7 @@ static int rkisp1_create_links(struct rkisp1_device *rkisp1)
ret = media_entity_get_fwnode_pad(&sd->entity, sd->fwnode, ret = media_entity_get_fwnode_pad(&sd->entity, sd->fwnode,
MEDIA_PAD_FL_SOURCE); MEDIA_PAD_FL_SOURCE);
if (ret < 0) { if (ret < 0) {
dev_err(sd->dev, "failed to find src pad for %s\n", dev_err(rkisp1->dev, "failed to find src pad for %s\n",
sd->name); sd->name);
return ret; return ret;
} }
......
...@@ -203,10 +203,8 @@ static struct v4l2_subdev *rkisp1_get_remote_sensor(struct v4l2_subdev *sd) ...@@ -203,10 +203,8 @@ static struct v4l2_subdev *rkisp1_get_remote_sensor(struct v4l2_subdev *sd)
local = &sd->entity.pads[RKISP1_ISP_PAD_SINK_VIDEO]; local = &sd->entity.pads[RKISP1_ISP_PAD_SINK_VIDEO];
remote = media_entity_remote_pad(local); remote = media_entity_remote_pad(local);
if (!remote) { if (!remote)
dev_warn(sd->dev, "No link between isp and sensor\n");
return NULL; return NULL;
}
sensor_me = remote->entity; sensor_me = remote->entity;
return media_entity_to_v4l2_subdev(sensor_me); return media_entity_to_v4l2_subdev(sensor_me);
...@@ -889,18 +887,20 @@ static const struct v4l2_subdev_pad_ops rkisp1_isp_pad_ops = { ...@@ -889,18 +887,20 @@ static const struct v4l2_subdev_pad_ops rkisp1_isp_pad_ops = {
static int rkisp1_mipi_csi2_start(struct rkisp1_isp *isp, static int rkisp1_mipi_csi2_start(struct rkisp1_isp *isp,
struct rkisp1_sensor_async *sensor) struct rkisp1_sensor_async *sensor)
{ {
struct rkisp1_device *rkisp1 =
container_of(isp->sd.v4l2_dev, struct rkisp1_device, v4l2_dev);
union phy_configure_opts opts; union phy_configure_opts opts;
struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy; struct phy_configure_opts_mipi_dphy *cfg = &opts.mipi_dphy;
s64 pixel_clock; s64 pixel_clock;
if (!sensor->pixel_rate_ctrl) { if (!sensor->pixel_rate_ctrl) {
dev_warn(sensor->sd->dev, "No pixel rate control in subdev\n"); dev_warn(rkisp1->dev, "No pixel rate control in sensor subdev\n");
return -EPIPE; return -EPIPE;
} }
pixel_clock = v4l2_ctrl_g_ctrl_int64(sensor->pixel_rate_ctrl); pixel_clock = v4l2_ctrl_g_ctrl_int64(sensor->pixel_rate_ctrl);
if (!pixel_clock) { if (!pixel_clock) {
dev_err(sensor->sd->dev, "Invalid pixel rate value\n"); dev_err(rkisp1->dev, "Invalid pixel rate value\n");
return -EINVAL; return -EINVAL;
} }
...@@ -933,8 +933,11 @@ static int rkisp1_isp_s_stream(struct v4l2_subdev *sd, int enable) ...@@ -933,8 +933,11 @@ static int rkisp1_isp_s_stream(struct v4l2_subdev *sd, int enable)
} }
sensor_sd = rkisp1_get_remote_sensor(sd); sensor_sd = rkisp1_get_remote_sensor(sd);
if (!sensor_sd) if (!sensor_sd) {
dev_warn(rkisp1->dev, "No link between isp and sensor\n");
return -ENODEV; return -ENODEV;
}
rkisp1->active_sensor = container_of(sensor_sd->asd, rkisp1->active_sensor = container_of(sensor_sd->asd,
struct rkisp1_sensor_async, asd); struct rkisp1_sensor_async, asd);
...@@ -1021,7 +1024,7 @@ int rkisp1_isp_register(struct rkisp1_device *rkisp1, ...@@ -1021,7 +1024,7 @@ int rkisp1_isp_register(struct rkisp1_device *rkisp1,
ret = v4l2_device_register_subdev(v4l2_dev, sd); ret = v4l2_device_register_subdev(v4l2_dev, sd);
if (ret) { if (ret) {
dev_err(sd->dev, "Failed to register isp subdev\n"); dev_err(rkisp1->dev, "Failed to register isp subdev\n");
goto err_cleanup_media_entity; goto err_cleanup_media_entity;
} }
......
...@@ -1607,7 +1607,7 @@ int rkisp1_params_register(struct rkisp1_params *params, ...@@ -1607,7 +1607,7 @@ int rkisp1_params_register(struct rkisp1_params *params,
goto err_release_queue; goto err_release_queue;
ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1); ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
if (ret) { if (ret) {
dev_err(&vdev->dev, dev_err(rkisp1->dev,
"failed to register %s, ret=%d\n", vdev->name, ret); "failed to register %s, ret=%d\n", vdev->name, ret);
goto err_cleanup_media_entity; goto err_cleanup_media_entity;
} }
......
...@@ -639,7 +639,7 @@ static int rkisp1_rsz_set_selection(struct v4l2_subdev *sd, ...@@ -639,7 +639,7 @@ static int rkisp1_rsz_set_selection(struct v4l2_subdev *sd,
if (sel->target != V4L2_SEL_TGT_CROP || sel->pad == RKISP1_RSZ_PAD_SRC) if (sel->target != V4L2_SEL_TGT_CROP || sel->pad == RKISP1_RSZ_PAD_SRC)
return -EINVAL; return -EINVAL;
dev_dbg(sd->dev, "%s: pad: %d sel(%d,%d)/%dx%d\n", __func__, dev_dbg(rsz->rkisp1->dev, "%s: pad: %d sel(%d,%d)/%dx%d\n", __func__,
sel->pad, sel->r.left, sel->r.top, sel->r.width, sel->r.height); sel->pad, sel->r.left, sel->r.top, sel->r.width, sel->r.height);
mutex_lock(&rsz->ops_lock); mutex_lock(&rsz->ops_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment