Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: vc04_services: vchiq_mmal: Rename service_callback()

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

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.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Stefan Wahren <wahrenst@gmx.net>
Link: https://lore.kernel.org/r/20240412075743.60712-10-umang.jain@ideasonboard.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Umang Jain and committed by
Greg Kroah-Hartman
7f56c601 12cc5f92

+4 -4
+4 -4
drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
··· 548 548 } 549 549 550 550 /* incoming event service callback */ 551 - static int service_callback(struct vchiq_instance *vchiq_instance, 552 - enum vchiq_reason reason, struct vchiq_header *header, 553 - unsigned int handle, void *bulk_ctx) 551 + static int mmal_service_callback(struct vchiq_instance *vchiq_instance, 552 + enum vchiq_reason reason, struct vchiq_header *header, 553 + unsigned int handle, void *bulk_ctx) 554 554 { 555 555 struct vchiq_mmal_instance *instance = vchiq_get_service_userdata(vchiq_instance, handle); 556 556 u32 msg_len; ··· 1862 1862 .version = VC_MMAL_VER, 1863 1863 .version_min = VC_MMAL_MIN_VER, 1864 1864 .fourcc = VCHIQ_MAKE_FOURCC('m', 'm', 'a', 'l'), 1865 - .callback = service_callback, 1865 + .callback = mmal_service_callback, 1866 1866 .userdata = NULL, 1867 1867 }; 1868 1868