Skip to content

Commit 66ec836

Browse files
krzkandersson
authored andcommitted
ASoC: qcom: Constify GPR packet being send over GPR interface
gpr_send_pkt() and pkt_router_send_svc_pkt() only send the GPR packet they receive, without any need to actually modify it, so mark the pointer to GPR packet as pointer to const for code safety and code self-documentation. Several users of this interface can follow up and also operate on pointer to const. Acked-by: Mathieu Poirier <mathieu.poirier@linaro.org> Acked-by: Mark Brown <broonie@kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com> Link: https://lore.kernel.org/r/20260317-rpmsg-send-const-v3-4-4d7fd27f037f@oss.qualcomm.com Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent b8077b4 commit 66ec836

6 files changed

Lines changed: 14 additions & 13 deletions

File tree

drivers/soc/qcom/apr.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,10 @@ gpr_port_t *gpr_alloc_port(struct apr_device *gdev, struct device *dev,
123123
}
124124
EXPORT_SYMBOL_GPL(gpr_alloc_port);
125125

126-
static int pkt_router_send_svc_pkt(struct pkt_router_svc *svc, struct gpr_pkt *pkt)
126+
static int pkt_router_send_svc_pkt(struct pkt_router_svc *svc, const struct gpr_pkt *pkt)
127127
{
128128
struct packet_router *pr = svc->pr;
129-
struct gpr_hdr *hdr;
129+
const struct gpr_hdr *hdr;
130130
unsigned long flags;
131131
int ret;
132132

@@ -139,13 +139,13 @@ static int pkt_router_send_svc_pkt(struct pkt_router_svc *svc, struct gpr_pkt *p
139139
return ret ? ret : hdr->pkt_size;
140140
}
141141

142-
int gpr_send_pkt(struct apr_device *gdev, struct gpr_pkt *pkt)
142+
int gpr_send_pkt(struct apr_device *gdev, const struct gpr_pkt *pkt)
143143
{
144144
return pkt_router_send_svc_pkt(&gdev->svc, pkt);
145145
}
146146
EXPORT_SYMBOL_GPL(gpr_send_pkt);
147147

148-
int gpr_send_port_pkt(gpr_port_t *port, struct gpr_pkt *pkt)
148+
int gpr_send_port_pkt(gpr_port_t *port, const struct gpr_pkt *pkt)
149149
{
150150
return pkt_router_send_svc_pkt(port, pkt);
151151
}

include/linux/soc/qcom/apr.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ int apr_send_pkt(struct apr_device *adev, struct apr_pkt *pkt);
191191
gpr_port_t *gpr_alloc_port(gpr_device_t *gdev, struct device *dev,
192192
gpr_port_cb cb, void *priv);
193193
void gpr_free_port(gpr_port_t *port);
194-
int gpr_send_port_pkt(gpr_port_t *port, struct gpr_pkt *pkt);
195-
int gpr_send_pkt(gpr_device_t *gdev, struct gpr_pkt *pkt);
194+
int gpr_send_port_pkt(gpr_port_t *port, const struct gpr_pkt *pkt);
195+
int gpr_send_pkt(gpr_device_t *gdev, const struct gpr_pkt *pkt);
196196

197197
#endif /* __QCOM_APR_H_ */

sound/soc/qcom/qdsp6/audioreach.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -579,10 +579,10 @@ EXPORT_SYMBOL_GPL(audioreach_alloc_graph_pkt);
579579
int audioreach_send_cmd_sync(struct device *dev, gpr_device_t *gdev,
580580
struct gpr_ibasic_rsp_result_t *result, struct mutex *cmd_lock,
581581
gpr_port_t *port, wait_queue_head_t *cmd_wait,
582-
struct gpr_pkt *pkt, uint32_t rsp_opcode)
582+
const struct gpr_pkt *pkt, uint32_t rsp_opcode)
583583
{
584584

585-
struct gpr_hdr *hdr = &pkt->hdr;
585+
const struct gpr_hdr *hdr = &pkt->hdr;
586586
int rc;
587587

588588
mutex_lock(cmd_lock);
@@ -622,7 +622,7 @@ int audioreach_send_cmd_sync(struct device *dev, gpr_device_t *gdev,
622622
}
623623
EXPORT_SYMBOL_GPL(audioreach_send_cmd_sync);
624624

625-
int audioreach_graph_send_cmd_sync(struct q6apm_graph *graph, struct gpr_pkt *pkt,
625+
int audioreach_graph_send_cmd_sync(struct q6apm_graph *graph, const struct gpr_pkt *pkt,
626626
uint32_t rsp_opcode)
627627
{
628628

sound/soc/qcom/qdsp6/audioreach.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -844,8 +844,8 @@ int audioreach_map_memory_regions(struct q6apm_graph *graph,
844844
bool is_contiguous);
845845
int audioreach_send_cmd_sync(struct device *dev, gpr_device_t *gdev, struct gpr_ibasic_rsp_result_t *result,
846846
struct mutex *cmd_lock, gpr_port_t *port, wait_queue_head_t *cmd_wait,
847-
struct gpr_pkt *pkt, uint32_t rsp_opcode);
848-
int audioreach_graph_send_cmd_sync(struct q6apm_graph *graph, struct gpr_pkt *pkt,
847+
const struct gpr_pkt *pkt, uint32_t rsp_opcode);
848+
int audioreach_graph_send_cmd_sync(struct q6apm_graph *graph, const struct gpr_pkt *pkt,
849849
uint32_t rsp_opcode);
850850
int audioreach_set_media_format(struct q6apm_graph *graph,
851851
const struct audioreach_module *module,

sound/soc/qcom/qdsp6/q6apm.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ struct apm_graph_mgmt_cmd {
2929

3030
static struct q6apm *g_apm;
3131

32-
int q6apm_send_cmd_sync(struct q6apm *apm, struct gpr_pkt *pkt, uint32_t rsp_opcode)
32+
int q6apm_send_cmd_sync(struct q6apm *apm, const struct gpr_pkt *pkt,
33+
uint32_t rsp_opcode)
3334
{
3435
gpr_device_t *gdev = apm->gdev;
3536

sound/soc/qcom/qdsp6/q6apm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ int q6apm_map_memory_regions(struct q6apm_graph *graph,
138138
int q6apm_unmap_memory_regions(struct q6apm_graph *graph,
139139
unsigned int dir);
140140
/* Helpers */
141-
int q6apm_send_cmd_sync(struct q6apm *apm, struct gpr_pkt *pkt,
141+
int q6apm_send_cmd_sync(struct q6apm *apm, const struct gpr_pkt *pkt,
142142
uint32_t rsp_opcode);
143143

144144
/* Callback for graph specific */

0 commit comments

Comments
 (0)