Skip to content

Commit 7f56c60

Browse files
Umang Jaingregkh
authored andcommitted
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 <[email protected]> Signed-off-by: Umang Jain <[email protected]> Reviewed-by: Stefan Wahren <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 12cc5f9 commit 7f56c60

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -548,9 +548,9 @@ static void bulk_abort_cb(struct vchiq_mmal_instance *instance,
548548
}
549549

550550
/* 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)
554554
{
555555
struct vchiq_mmal_instance *instance = vchiq_get_service_userdata(vchiq_instance, handle);
556556
u32 msg_len;
@@ -1862,7 +1862,7 @@ int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance)
18621862
.version = VC_MMAL_VER,
18631863
.version_min = VC_MMAL_MIN_VER,
18641864
.fourcc = VCHIQ_MAKE_FOURCC('m', 'm', 'a', 'l'),
1865-
.callback = service_callback,
1865+
.callback = mmal_service_callback,
18661866
.userdata = NULL,
18671867
};
18681868

0 commit comments

Comments
 (0)