The cal_quickdump_regs() dumps registers for the two CAMERARX instances.
Retrieve those instances from the cal_dev directly instead of going
through the contexts, and simplify the code by using a loop.
Signed-off-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Reviewed-by: Benoit Parrot <bparrot@xxxxxx>
---
drivers/media/platform/ti-vpe/cal.c | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index 59fa1f8c1564..03b4d5351bfd 100644
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -450,26 +450,24 @@ static inline void set_field(u32 *valp, u32 field, u32 mask)
static void cal_quickdump_regs(struct cal_dev *cal)
{
+ unsigned int i;
+
cal_info(cal, "CAL Registers @ 0x%pa:\n", &cal->res->start);
print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 4,
(__force const void *)cal->base,
resource_size(cal->res), false);
- if (cal->ctx[0]) {
- cal_info(cal, "CSI2 Core 0 Registers @ %pa:\n",
- &cal->ctx[0]->phy->res->start);
- print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 4,
- (__force const void *)cal->ctx[0]->phy->base,
- resource_size(cal->ctx[0]->phy->res),
- false);
- }
+ for (i = 0; i < ARRAY_SIZE(cal->phy); ++i) {
+ struct cal_camerarx *phy = cal->phy[i];
+
+ if (!phy)
+ continue;
- if (cal->ctx[1]) {
- cal_info(cal, "CSI2 Core 1 Registers @ %pa:\n",
- &cal->ctx[1]->phy->res->start);
+ cal_info(cal, "CSI2 Core %u Registers @ %pa:\n", i,
+ &phy->res->start);
print_hex_dump(KERN_INFO, "", DUMP_PREFIX_OFFSET, 16, 4,
- (__force const void *)cal->ctx[1]->phy->base,
- resource_size(cal->ctx[1]->phy->res),
+ (__force const void *)phy->base,
+ resource_size(phy->res),
false);
}
}
--
Regards,
Laurent Pinchart
