Commit 2f63379b authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab

media: ti-vpe: cal: Use a loop to create CAMERARX and context instances

Replace a manually unrolled loop with an explicit for loop to increase
readability when creating the CAMERARX and context instances. The
explicit NULL initialization of cal->phy[] and cal->ctx[] is removed, as
the cal structure is zeroed when allocated.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: default avatarBenoit Parrot <bparrot@ti.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent ed595da7
...@@ -2348,24 +2348,15 @@ static int cal_probe(struct platform_device *pdev) ...@@ -2348,24 +2348,15 @@ static int cal_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, cal); platform_set_drvdata(pdev, cal);
cal->phy[0] = cal_camerarx_create(cal, 0); for (i = 0; i < cal->data->num_csi2_phy; ++i) {
if (IS_ERR(cal->phy[0])) cal->phy[i] = cal_camerarx_create(cal, i);
return PTR_ERR(cal->phy[0]); if (IS_ERR(cal->phy[i]))
return PTR_ERR(cal->phy[i]);
if (cal->data->num_csi2_phy > 1) {
cal->phy[1] = cal_camerarx_create(cal, 1);
if (IS_ERR(cal->phy[1]))
return PTR_ERR(cal->phy[1]);
} else {
cal->phy[1] = NULL;
} }
cal->ctx[0] = NULL; for (i = 0; i < cal->data->num_csi2_phy; ++i)
cal->ctx[1] = NULL; cal->ctx[i] = cal_create_instance(cal, i);
cal->ctx[0] = cal_create_instance(cal, 0);
if (cal->data->num_csi2_phy > 1)
cal->ctx[1] = cal_create_instance(cal, 1);
if (!cal->ctx[0] && !cal->ctx[1]) { if (!cal->ctx[0] && !cal->ctx[1]) {
cal_err(cal, "Neither port is configured, no point in staying up\n"); cal_err(cal, "Neither port is configured, no point in staying up\n");
return -ENODEV; return -ENODEV;
......
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