Commit bfb1b998 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Hans Verkuil
Browse files

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



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: bf1d556a ("media: mtk-vcodec: abstract firmware interface")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent d0b07f71

drivers/media/platform/mediatek/mdp/mtk_mdp_vpu.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}



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)

{

	const struct mdp_ipi_comm_ack *msg = data;

drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_fw_vpu.c

+1 −9
Original line number Diff line number Diff line
@@ -29,15 +29,7 @@ static int mtk_vcodec_vpu_set_ipi_register(struct mtk_vcodec_fw *fw, int id, 
					   mtk_vcodec_ipi_handler handler,

					   const char *name, void *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);

	return vpu_ipi_register(fw->pdev, id, handler, name, priv);

}



static int mtk_vcodec_vpu_ipi_send(struct mtk_vcodec_fw *fw, int id, void *buf,

drivers/media/platform/mediatek/vpu/mtk_vpu.c

+1 −1
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ int vpu_load_firmware(struct platform_device *pdev) 
}

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;

	const struct vpu_run *run = data;

drivers/media/platform/mediatek/vpu/mtk_vpu.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
 * 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,

			       void *priv);