The original cmdq_pkt_write() and cmdq_pkt_write_mask() only supported
generating GCE instructions with subsys ID. They have been replaced by
cmdq_pkt_write_pa(), cmdq_pkt_write_subsys(), cmdq_pkt_write_mask_pa()
and cmdq_pkt_write_mask_subsys().
These 2 functions can now be removed as they are no longer in use.
Signed-off-by: Jason-JH Lin <jason-jh....@mediatek.com>
---
drivers/soc/mediatek/mtk-cmdq-helper.c | 49 ++++++++++----------------
include/linux/soc/mediatek/mtk-cmdq.h | 35 ------------------
2 files changed, 18 insertions(+), 66 deletions(-)
diff --git a/drivers/soc/mediatek/mtk-cmdq-helper.c
b/drivers/soc/mediatek/mtk-cmdq-helper.c
index 0a718ffa5f3b..5822a3d13bda 100644
--- a/drivers/soc/mediatek/mtk-cmdq-helper.c
+++ b/drivers/soc/mediatek/mtk-cmdq-helper.c
@@ -201,18 +201,6 @@ static int cmdq_pkt_mask(struct cmdq_pkt *pkt, u32 mask)
return cmdq_pkt_append_command(pkt, inst);
}
-int cmdq_pkt_write(struct cmdq_pkt *pkt, u8 subsys, u16 offset, u32 value)
-{
- struct cmdq_instruction inst = {
- .op = CMDQ_CODE_WRITE,
- .value = value,
- .offset = offset,
- .subsys = subsys
- };
- return cmdq_pkt_append_command(pkt, inst);
-}
-EXPORT_SYMBOL(cmdq_pkt_write);
-
int cmdq_pkt_write_pa(struct cmdq_pkt *pkt, u8 subsys /*unused*/, u32 pa_base,
u16 offset, u32 value)
{
@@ -229,27 +217,16 @@ EXPORT_SYMBOL(cmdq_pkt_write_pa);
int cmdq_pkt_write_subsys(struct cmdq_pkt *pkt, u8 subsys, u32 pa_base
/*unused*/,
u16 offset, u32 value)
{
- return cmdq_pkt_write(pkt, subsys, offset, value);
+ struct cmdq_instruction inst = {
+ .op = CMDQ_CODE_WRITE,
+ .value = value,
+ .offset = offset,
+ .subsys = subsys
+ };
+ return cmdq_pkt_append_command(pkt, inst);
}
EXPORT_SYMBOL(cmdq_pkt_write_subsys);
-int cmdq_pkt_write_mask(struct cmdq_pkt *pkt, u8 subsys,
- u16 offset, u32 value, u32 mask)
-{
- u16 offset_mask = offset;
- int err;
-
- if (mask != GENMASK(31, 0)) {
- err = cmdq_pkt_mask(pkt, mask);
- if (err < 0)
- return err;
-
- offset_mask |= CMDQ_WRITE_ENABLE_MASK;
- }
- return cmdq_pkt_write(pkt, subsys, offset_mask, value);
-}
-EXPORT_SYMBOL(cmdq_pkt_write_mask);
-
int cmdq_pkt_write_mask_pa(struct cmdq_pkt *pkt, u8 subsys /*unused*/, u32
pa_base,
u16 offset, u32 value, u32 mask)
{
@@ -267,7 +244,17 @@ EXPORT_SYMBOL(cmdq_pkt_write_mask_pa);
int cmdq_pkt_write_mask_subsys(struct cmdq_pkt *pkt, u8 subsys, u32 pa_base
/*unused*/,
u16 offset, u32 value, u32 mask)
{
- return cmdq_pkt_write_mask(pkt, subsys, offset, value, mask);
+ u16 offset_mask = offset;
+ int err;
+
+ if (mask != GENMASK(31, 0)) {
+ err = cmdq_pkt_mask(pkt, mask);
+ if (err < 0)
+ return err;
+
+ offset_mask |= CMDQ_WRITE_ENABLE_MASK;
+ }
+ return cmdq_pkt_write_subsys(pkt, subsys, pa_base, offset_mask, value);
}
EXPORT_SYMBOL(cmdq_pkt_write_mask_subsys);
diff --git a/include/linux/soc/mediatek/mtk-cmdq.h
b/include/linux/soc/mediatek/mtk-cmdq.h
index 4a2acceb8581..f4663fbfb5a0 100644
--- a/include/linux/soc/mediatek/mtk-cmdq.h
+++ b/include/linux/soc/mediatek/mtk-cmdq.h
@@ -113,17 +113,6 @@ int cmdq_pkt_create(struct cmdq_client *client, struct
cmdq_pkt *pkt, size_t siz
*/
void cmdq_pkt_destroy(struct cmdq_client *client, struct cmdq_pkt *pkt);
-/**
- * cmdq_pkt_write() - append write command to the CMDQ packet
- * @pkt: the CMDQ packet
- * @subsys: the CMDQ sub system code
- * @offset: register offset from CMDQ sub system
- * @value: the specified target register value
- *
- * Return: 0 for success; else the error code is returned
- */
-int cmdq_pkt_write(struct cmdq_pkt *pkt, u8 subsys, u16 offset, u32 value);
-
/**
* cmdq_pkt_write_pa() - append write command to the CMDQ packet with pa_base
* @pkt: the CMDQ packet
@@ -150,19 +139,6 @@ int cmdq_pkt_write_pa(struct cmdq_pkt *pkt, u8 subsys
/*unused*/,
int cmdq_pkt_write_subsys(struct cmdq_pkt *pkt, u8 subsys,
u32 pa_base /*unused*/, u16 offset, u32 value);
-/**
- * cmdq_pkt_write_mask() - append write command with mask to the CMDQ packet
- * @pkt: the CMDQ packet
- * @subsys: the CMDQ sub system code
- * @offset: register offset from CMDQ sub system
- * @value: the specified target register value
- * @mask: the specified target register mask
- *
- * Return: 0 for success; else the error code is returned
- */
-int cmdq_pkt_write_mask(struct cmdq_pkt *pkt, u8 subsys,
- u16 offset, u32 value, u32 mask);
-
/**
* cmdq_pkt_write_mask_pa() - append write command with mask to the CMDQ
packet with pa
* @pkt: the CMDQ packet
@@ -460,11 +436,6 @@ static inline int cmdq_pkt_create(struct cmdq_client
*client, struct cmdq_pkt *p
static inline void cmdq_pkt_destroy(struct cmdq_client *client, struct
cmdq_pkt *pkt) { }
-static inline int cmdq_pkt_write(struct cmdq_pkt *pkt, u8 subsys, u16 offset,
u32 value)
-{
- return -ENOENT;
-}
-
static inline int cmdq_pkt_write_pa(struct cmdq_pkt *pkt, u8 subsys /*unused*/,
u32 pa_base, u16 offset, u32 value)
{
@@ -477,12 +448,6 @@ static inline int cmdq_pkt_write_subsys(struct cmdq_pkt
*pkt, u8 subsys,
return -ENOENT;
}
-static inline int cmdq_pkt_write_mask(struct cmdq_pkt *pkt, u8 subsys,
- u16 offset, u32 value, u32 mask)
-{
- return -ENOENT;
-}
-
static inline int cmdq_pkt_write_mask_pa(struct cmdq_pkt *pkt, u8 subsys
/*unused*/,
u32 pa_base, u16 offset, u32 value,
u32 mask)
{
--
2.43.0
