mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-02-21 23:29:26 -05:00
media: qcom: camss: reducing the repitious error message string
Introducing a new function camss_link_err to avoid repition of same error message, improving code maintainability. Signed-off-by: Vikram Sharma <quic_vikramsa@quicinc.com> Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
This commit is contained in:
committed by
Hans Verkuil
parent
c10597366f
commit
53b01a5fdb
@@ -1993,6 +1993,24 @@ static int camss_init_subdevices(struct camss *camss)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* camss_link_entities - Register subdev nodes and create links
|
||||
* camss_link_err - print error in case link creation fails
|
||||
* @src_name: name for source of the link
|
||||
* @sink_name: name for sink of the link
|
||||
*/
|
||||
inline void camss_link_err(struct camss *camss,
|
||||
const char *src_name,
|
||||
const char *sink_name,
|
||||
int ret)
|
||||
{
|
||||
dev_err(camss->dev,
|
||||
"Failed to link %s->%s entities: %d\n",
|
||||
src_name,
|
||||
sink_name,
|
||||
ret);
|
||||
}
|
||||
|
||||
/*
|
||||
* camss_link_entities - Register subdev nodes and create links
|
||||
* @camss: CAMSS device
|
||||
@@ -2012,11 +2030,10 @@ static int camss_link_entities(struct camss *camss)
|
||||
MSM_CSID_PAD_SINK,
|
||||
0);
|
||||
if (ret < 0) {
|
||||
dev_err(camss->dev,
|
||||
"Failed to link %s->%s entities: %d\n",
|
||||
camss->csiphy[i].subdev.entity.name,
|
||||
camss->csid[j].subdev.entity.name,
|
||||
ret);
|
||||
camss_link_err(camss,
|
||||
camss->csiphy[i].subdev.entity.name,
|
||||
camss->csid[j].subdev.entity.name,
|
||||
ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
@@ -2031,11 +2048,10 @@ static int camss_link_entities(struct camss *camss)
|
||||
MSM_ISPIF_PAD_SINK,
|
||||
0);
|
||||
if (ret < 0) {
|
||||
dev_err(camss->dev,
|
||||
"Failed to link %s->%s entities: %d\n",
|
||||
camss->csid[i].subdev.entity.name,
|
||||
camss->ispif->line[j].subdev.entity.name,
|
||||
ret);
|
||||
camss_link_err(camss,
|
||||
camss->csid[i].subdev.entity.name,
|
||||
camss->ispif->line[j].subdev.entity.name,
|
||||
ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
@@ -2053,11 +2069,9 @@ static int camss_link_entities(struct camss *camss)
|
||||
MSM_VFE_PAD_SINK,
|
||||
0);
|
||||
if (ret < 0) {
|
||||
dev_err(camss->dev,
|
||||
"Failed to link %s->%s entities: %d\n",
|
||||
ispif->entity.name,
|
||||
vfe->entity.name,
|
||||
ret);
|
||||
camss_link_err(camss, ispif->entity.name,
|
||||
vfe->entity.name,
|
||||
ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
@@ -2074,11 +2088,9 @@ static int camss_link_entities(struct camss *camss)
|
||||
MSM_VFE_PAD_SINK,
|
||||
0);
|
||||
if (ret < 0) {
|
||||
dev_err(camss->dev,
|
||||
"Failed to link %s->%s entities: %d\n",
|
||||
csid->entity.name,
|
||||
vfe->entity.name,
|
||||
ret);
|
||||
camss_link_err(camss, csid->entity.name,
|
||||
vfe->entity.name,
|
||||
ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
@@ -2227,9 +2239,9 @@ static int camss_subdev_notifier_complete(struct v4l2_async_notifier *async)
|
||||
input, MSM_CSIPHY_PAD_SINK,
|
||||
MEDIA_LNK_FL_IMMUTABLE | MEDIA_LNK_FL_ENABLED);
|
||||
if (ret < 0) {
|
||||
dev_err(camss->dev,
|
||||
"Failed to link %s->%s entities: %d\n",
|
||||
sensor->name, input->name, ret);
|
||||
camss_link_err(camss, sensor->name,
|
||||
input->name,
|
||||
ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user