Since all users have migrated to the new cmdq_pkt_jump* APIs without shift_pa, the wrapper APIs cmdq_pkt_jump() and cmdq_pkt_jump_rel_temp() can be removed.
Signed-off-by: Jason-JH Lin <[email protected]> Reviewed-by: AngeloGioacchino Del Regno <[email protected]> --- include/linux/soc/mediatek/mtk-cmdq.h | 30 --------------------------- 1 file changed, 30 deletions(-) diff --git a/include/linux/soc/mediatek/mtk-cmdq.h b/include/linux/soc/mediatek/mtk-cmdq.h index 3d0de1a9cac1..be67bee043ce 100644 --- a/include/linux/soc/mediatek/mtk-cmdq.h +++ b/include/linux/soc/mediatek/mtk-cmdq.h @@ -423,12 +423,6 @@ int cmdq_pkt_poll_addr(struct cmdq_pkt *pkt, dma_addr_t addr, u32 value, u32 mas */ int cmdq_pkt_jump_abs(struct cmdq_pkt *pkt, dma_addr_t addr); -/* This wrapper has to be removed after all users migrated to jump_abs */ -static inline int cmdq_pkt_jump(struct cmdq_pkt *pkt, dma_addr_t addr) -{ - return cmdq_pkt_jump_abs(pkt, addr); -} - /** * cmdq_pkt_jump_rel() - Append jump command to the CMDQ packet, ask GCE * to execute an instruction that change current thread @@ -441,24 +435,6 @@ static inline int cmdq_pkt_jump(struct cmdq_pkt *pkt, dma_addr_t addr) */ int cmdq_pkt_jump_rel(struct cmdq_pkt *pkt, s32 offset); -/** - * cmdq_pkt_jump_rel_temp() - Temporary wrapper for new CMDQ helper API - * @pkt: the CMDQ packet - * @offset: relative offset of target instruction buffer from current PC. - * @shift_pa: [DEPRECATED] shift bits of physical address in CMDQ instruction. - * This value is got by cmdq_get_shift_pa(). - * - * This function is a temporary wrapper that was introduced only for ease of - * migration of the many users of the CMDQ API located in multiple kernel - * subsystems. - * - * This has to be removed after all users are migrated to the newer CMDQ API. - */ -static inline int cmdq_pkt_jump_rel_temp(struct cmdq_pkt *pkt, s32 offset, u8 shift_pa) -{ - return cmdq_pkt_jump_rel(pkt, offset); -} - /** * cmdq_pkt_eoc() - Append EOC and ask GCE to generate an IRQ at end of execution * @pkt: The CMDQ packet @@ -613,12 +589,6 @@ static inline int cmdq_pkt_jump_rel(struct cmdq_pkt *pkt, s32 offset) return -EINVAL; } -/* This wrapper has to be removed after all users migrated to jump_rel */ -static inline int cmdq_pkt_jump_rel_temp(struct cmdq_pkt *pkt, s32 offset, u8 shift_pa) -{ - return -EINVAL; -} - static inline int cmdq_pkt_eoc(struct cmdq_pkt *pkt) { return -EINVAL; -- 2.43.0
