Hi Umang,
Thank you for the patch.
On Thu, Mar 28, 2024 at 11:41:31PM +0530, Umang Jain wrote:
> Rename the service_callback static function to mmal_service_callback()
> since the function signature conflicts with:
>
> extern int
> service_callback(struct vchiq_instance *vchiq_instance, enum vchiq_reason reason,
> struct vchiq_header *header, unsigned int handle, void *bulk_userdata);
>
> in vc04_services/interface/vchiq_arm/vchiq_arm.h
I would rename this function too. It can be done in a separate patch.
>
> In a subsequent patch, we will include vchiq_arm.h header to
> mmal-vchiq.c, which will then complain of this conflict. Hence,
> this patch is meant to handle the conflict beforehand.
>
> Signed-off-by: Umang Jain <umang.jain@xxxxxxxxxxxxxxxx>
Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
> index 258aa0e37f55..e9cac8f3f744 100644
> --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
> +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
> @@ -548,9 +548,9 @@ static void bulk_abort_cb(struct vchiq_mmal_instance *instance,
> }
>
> /* incoming event service callback */
> -static int service_callback(struct vchiq_instance *vchiq_instance,
> - enum vchiq_reason reason, struct vchiq_header *header,
> - unsigned int handle, void *bulk_ctx)
> +static int mmal_service_callback(struct vchiq_instance *vchiq_instance,
> + enum vchiq_reason reason, struct vchiq_header *header,
> + unsigned int handle, void *bulk_ctx)
> {
> struct vchiq_mmal_instance *instance = vchiq_get_service_userdata(vchiq_instance, handle);
> u32 msg_len;
> @@ -1861,7 +1861,7 @@ int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance)
> .version = VC_MMAL_VER,
> .version_min = VC_MMAL_MIN_VER,
> .fourcc = VCHIQ_MAKE_FOURCC('m', 'm', 'a', 'l'),
> - .callback = service_callback,
> + .callback = mmal_service_callback,
> .userdata = NULL,
> };
>
--
Regards,
Laurent Pinchart
