Commit 5b5089e2 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mark Brown

ASoC: q6dsp: fix event handler prototype

clang-16 points out a mismatch in function types that was hidden
by a typecast:

sound/soc/qcom/qdsp6/q6apm-dai.c:355:38: error: cast from 'void (*)(uint32_t, uint32_t, uint32_t *, void *)' (aka 'void (*)(unsigned int, unsigned int, unsigned int *, void *)') to 'q6apm_cb' (aka 'void (*)(unsigned int, unsigned int, void *, void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict]
  355 |         prtd->graph = q6apm_graph_open(dev, (q6apm_cb)event_handler, prtd, graph_id);
sound/soc/qcom/qdsp6/q6apm-dai.c:499:38: error: cast from 'void (*)(uint32_t, uint32_t, uint32_t *, void *)' (aka 'void (*)(unsigned int, unsigned int, unsigned int *, void *)') to 'q6apm_cb' (aka 'void (*)(unsigned int, unsigned int, void *, void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict]
  499 |         prtd->graph = q6apm_graph_open(dev, (q6apm_cb)event_handler_compr, prtd, graph_id);

The only difference here is the 'payload' argument, which is not even
used in this function, so just fix its type and remove the cast.

Fixes: 88b60bf0 ("ASoC: q6dsp: q6apm-dai: Add open/free compress DAI callbacks")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://msgid.link/r/20240213101105.459402-1-arnd@kernel.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent f7fe85b2
...@@ -123,7 +123,7 @@ static struct snd_pcm_hardware q6apm_dai_hardware_playback = { ...@@ -123,7 +123,7 @@ static struct snd_pcm_hardware q6apm_dai_hardware_playback = {
.fifo_size = 0, .fifo_size = 0,
}; };
static void event_handler(uint32_t opcode, uint32_t token, uint32_t *payload, void *priv) static void event_handler(uint32_t opcode, uint32_t token, void *payload, void *priv)
{ {
struct q6apm_dai_rtd *prtd = priv; struct q6apm_dai_rtd *prtd = priv;
struct snd_pcm_substream *substream = prtd->substream; struct snd_pcm_substream *substream = prtd->substream;
...@@ -157,7 +157,7 @@ static void event_handler(uint32_t opcode, uint32_t token, uint32_t *payload, vo ...@@ -157,7 +157,7 @@ static void event_handler(uint32_t opcode, uint32_t token, uint32_t *payload, vo
} }
static void event_handler_compr(uint32_t opcode, uint32_t token, static void event_handler_compr(uint32_t opcode, uint32_t token,
uint32_t *payload, void *priv) void *payload, void *priv)
{ {
struct q6apm_dai_rtd *prtd = priv; struct q6apm_dai_rtd *prtd = priv;
struct snd_compr_stream *substream = prtd->cstream; struct snd_compr_stream *substream = prtd->cstream;
...@@ -352,7 +352,7 @@ static int q6apm_dai_open(struct snd_soc_component *component, ...@@ -352,7 +352,7 @@ static int q6apm_dai_open(struct snd_soc_component *component,
spin_lock_init(&prtd->lock); spin_lock_init(&prtd->lock);
prtd->substream = substream; prtd->substream = substream;
prtd->graph = q6apm_graph_open(dev, (q6apm_cb)event_handler, prtd, graph_id); prtd->graph = q6apm_graph_open(dev, event_handler, prtd, graph_id);
if (IS_ERR(prtd->graph)) { if (IS_ERR(prtd->graph)) {
dev_err(dev, "%s: Could not allocate memory\n", __func__); dev_err(dev, "%s: Could not allocate memory\n", __func__);
ret = PTR_ERR(prtd->graph); ret = PTR_ERR(prtd->graph);
...@@ -496,7 +496,7 @@ static int q6apm_dai_compr_open(struct snd_soc_component *component, ...@@ -496,7 +496,7 @@ static int q6apm_dai_compr_open(struct snd_soc_component *component,
return -ENOMEM; return -ENOMEM;
prtd->cstream = stream; prtd->cstream = stream;
prtd->graph = q6apm_graph_open(dev, (q6apm_cb)event_handler_compr, prtd, graph_id); prtd->graph = q6apm_graph_open(dev, event_handler_compr, prtd, graph_id);
if (IS_ERR(prtd->graph)) { if (IS_ERR(prtd->graph)) {
ret = PTR_ERR(prtd->graph); ret = PTR_ERR(prtd->graph);
kfree(prtd); kfree(prtd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment