xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: mediatek: vcodec: avoid -Wcast-function-type-strict warning

Browse Source 
[ Upstream commit bfb1b99802ef16045402deb855c197591dc78886 ]

The ipi handler here tries hard to maintain const-ness of its argument,
but by doing that causes a warning about function type casts:

drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vpu.c:38:32: error: cast from 'mtk_vcodec_ipi_handler' (aka 'void (*)(void *, unsigned int, void *)') to 'ipi_handler_t' (aka 'void (*)(const void *, unsigned int, void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict]
   38 |         ipi_handler_t handler_const = (ipi_handler_t)handler;
      |                                       ^~~~~~~~~~~~~~~~~~~~~~

Remove the hack and just use a non-const argument.

Fixes: bf1d556ad4 ("media: mtk-vcodec: abstract firmware interface")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Arnd Bergmann
2024-02-24 13:10:22 +01:00
committed by Sasha Levin
parent 910363473e
commit 6c5a15622e
4 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c
View File

@@ -26,7 +26,7 @@ static void mtk_mdp_vpu_handle_init_ack(const struct mdp_ipi_comm_ack *msg)
vpu->inst_addr = msg->vpu_inst_addr; vpu->inst_addr = msg->vpu_inst_addr;
} }
static void mtk_mdp_vpu_ipi_handler(const void *data, unsigned int len, static void mtk_mdp_vpu_ipi_handler(void *data, unsigned int len,
void *priv) void *priv)
{ {
const struct mdp_ipi_comm_ack *msg = data; const struct mdp_ipi_comm_ack *msg = data;

10
drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c
View File

@@ -29,15 +29,7 @@ static int mtk_vcodec_vpu_set_ipi_register(struct mtk_vcodec_fw *fw, int id,
mtk_vcodec_ipi_handler handler, mtk_vcodec_ipi_handler handler,
const char *name, void *priv) const char *name, void *priv)
{ {
/* return vpu_ipi_register(fw->pdev, id, handler, name, priv);
* The handler we receive takes a void * as its first argument. We
* cannot change this because it needs to be passed down to the rproc
* subsystem when SCP is used. VPU takes a const argument, which is
* more constrained, so the conversion below is safe.
*/
ipi_handler_t handler_const = (ipi_handler_t)handler;
return vpu_ipi_register(fw->pdev, id, handler_const, name, priv);
} }
static int mtk_vcodec_vpu_ipi_send(struct mtk_vcodec_fw *fw, int id, void *buf, static int mtk_vcodec_vpu_ipi_send(struct mtk_vcodec_fw *fw, int id, void *buf,

2
drivers/media/platform/mtk-vpu/mtk_vpu.c
View File

@@ -612,7 +612,7 @@ OUT_LOAD_FW:
} }
EXPORT_SYMBOL_GPL(vpu_load_firmware); EXPORT_SYMBOL_GPL(vpu_load_firmware);
static void vpu_init_ipi_handler(const void *data, unsigned int len, void *priv) static void vpu_init_ipi_handler(void *data, unsigned int len, void *priv)
{ {
struct mtk_vpu *vpu = priv; struct mtk_vpu *vpu = priv;
const struct vpu_run *run = data; const struct vpu_run *run = data;

2
drivers/media/platform/mtk-vpu/mtk_vpu.h
View File

@@ -15,7 +15,7 @@
* VPU interfaces with other blocks by share memory and interrupt. * VPU interfaces with other blocks by share memory and interrupt.
**/ **/
typedef void (*ipi_handler_t) (const void *data, typedef void (*ipi_handler_t) (void *data,
unsigned int len, unsigned int len,
void *priv); void *priv);