Revert "v4l: vsp1: Provide display list body rewrite functionality"
This reverts commit 87858ac324064118221915cba94fb70309c80646.
diff --git a/drivers/media/platform/vsp1/vsp1_dl.c b/drivers/media/platform/vsp1/vsp1_dl.c
index f21d7b4..e91c7d3 100644
--- a/drivers/media/platform/vsp1/vsp1_dl.c
+++ b/drivers/media/platform/vsp1/vsp1_dl.c
@@ -269,30 +269,6 @@ void vsp1_dl_fragment_write(struct vsp1_dl_body *dlb, u32 reg, u32 data)
dlb->num_entries++;
}
-/**
- * vsp1_dl_fragment_rewrite - Rewrite a register in a display list fragment
- * @dlb: The fragment
- * @reg: The register address
- * @data: The register value
- *
- * Identify a register already entered into a display list fragment. Rewrite the
- * value that register specifies in the display list. If the register is not
- * already in the list, add as normally expected by vsp1_dl_fragment_write()
- */
-void vsp1_dl_fragment_rewrite(struct vsp1_dl_body *dlb, u32 reg, u32 data)
-{
- int i;
-
- for (i = 0; i < dlb->num_entries; i++)
- if (dlb->entries[i].addr == reg)
- break;
-
- if (i < dlb->num_entries)
- dlb->entries[i].data = data;
- else
- vsp1_dl_fragment_write(dlb, reg, data);
-}
-
/* -----------------------------------------------------------------------------
* Display List Transaction Management
*/
@@ -439,20 +415,6 @@ void vsp1_dl_list_write(struct vsp1_dl_list *dl, u32 reg, u32 data)
}
/**
- * vsp1_dl_list_rewrite - Update a register in the display list
- * @dl: The display list
- * @reg: The register address
- * @data: The register value
- *
- * Update the given register and value to the display list. If the register does
- * not already exist in the list it will be added
- */
-void vsp1_dl_list_rewrite(struct vsp1_dl_list *dl, u32 reg, u32 data)
-{
- vsp1_dl_fragment_rewrite(&dl->body0, reg, data);
-}
-
-/**
* vsp1_dl_list_add_fragment - Add a fragment to the display list
* @dl: The display list
* @dlb: The fragment
diff --git a/drivers/media/platform/vsp1/vsp1_dl.h b/drivers/media/platform/vsp1/vsp1_dl.h
index 5833c08..dca4592 100644
--- a/drivers/media/platform/vsp1/vsp1_dl.h
+++ b/drivers/media/platform/vsp1/vsp1_dl.h
@@ -34,7 +34,6 @@ bool vsp1_dlm_irq_frame_end(struct vsp1_dl_manager *dlm);
struct vsp1_dl_list *vsp1_dl_list_get(struct vsp1_dl_manager *dlm);
void vsp1_dl_list_put(struct vsp1_dl_list *dl);
void vsp1_dl_list_write(struct vsp1_dl_list *dl, u32 reg, u32 data);
-void vsp1_dl_list_rewrite(struct vsp1_dl_list *dl, u32 reg, u32 data);
void vsp1_dl_list_commit(struct vsp1_dl_list *dl);
struct vsp1_dl_fragment_pool *
@@ -48,7 +47,6 @@ struct vsp1_dl_body *vsp1_dl_fragment_alloc(struct vsp1_device *vsp1,
unsigned int num_entries);
void vsp1_dl_fragment_free(struct vsp1_dl_body *dlb);
void vsp1_dl_fragment_write(struct vsp1_dl_body *dlb, u32 reg, u32 data);
-void vsp1_dl_fragment_rewrite(struct vsp1_dl_body *dlb, u32 reg, u32 data);
int vsp1_dl_list_add_fragment(struct vsp1_dl_list *dl,
struct vsp1_dl_body *dlb);
int vsp1_dl_list_add_chain(struct vsp1_dl_list *head, struct vsp1_dl_list *dl);
