media: i2c: adv748x: Remove PAGE_WAIT

The ADV748X_PAGE_WAIT is a fake page to insert arbitrary delays in the
register tables.

Its only usage was removed, so we can remove the handling and simplify
the code.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/i2c/adv748x/adv748x-core.c b/drivers/media/i2c/adv748x/adv748x-core.c
index 252bdb28b18bee080f05a29bd6e2e00fa8debffa..f57cd77a32fac9c741269a02267b1f9b96580e63 100644 (file)
--- a/drivers/media/i2c/adv748x/adv748x-core.c
+++ b/drivers/media/i2c/adv748x/adv748x-core.c
@@ -218,20 +218,13 @@ static int adv748x_write_regs(struct adv748x_state *state,
 {
        int ret;
 
-       while (regs->page != ADV748X_PAGE_EOR) {
-               if (regs->page == ADV748X_PAGE_WAIT) {
-                       msleep(regs->value);
-               } else {
-                       ret = adv748x_write(state, regs->page, regs->reg,
-                                     regs->value);
-                       if (ret < 0) {
-                               adv_err(state,
-                                       "Error regs page: 0x%02x reg: 0x%02x\n",
-                                       regs->page, regs->reg);
-                               return ret;
-                       }
+       for (; regs->page != ADV748X_PAGE_EOR; regs++) {
+               ret = adv748x_write(state, regs->page, regs->reg, regs->value);
+               if (ret < 0) {
+                       adv_err(state, "Error regs page: 0x%02x reg: 0x%02x\n",
+                               regs->page, regs->reg);
+                       return ret;
                }
-               regs++;
        }
 
        return 0;

diff --git a/drivers/media/i2c/adv748x/adv748x.h b/drivers/media/i2c/adv748x/adv748x.h
index 2f8d751cfbb0db1c0fa8d5ea6fc3e85482e0f151..5042f9e94aee2dd75297e131541516bd2b5bc9dc 100644 (file)
--- a/drivers/media/i2c/adv748x/adv748x.h
+++ b/drivers/media/i2c/adv748x/adv748x.h
@@ -39,7 +39,6 @@ enum adv748x_page {
        ADV748X_PAGE_MAX,
 
        /* Fake pages for register sequences */
-       ADV748X_PAGE_WAIT,              /* Wait x msec */
        ADV748X_PAGE_EOR,               /* End Mark */
 };