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

staging: vchiq_arm: fix enum vchiq_status return types

gcc-13 notices a type mismatch between function declaration
and definition for a few functions that have been converted
from returning vchiq specific status values to regular error
codes:

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c:662:5: error: conflicting types for 'vchiq_initialise' due to enum/integer mismatch; have 'int(struct vchiq_instance **)' [-Werror=enum-int-mismatch]
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c:1411:1: error: conflicting types for 'vchiq_use_internal' due to enum/integer mismatch; have 'int(struct vchiq_state *, struct vchiq_service *, enum USE_TYPE_E)' [-Werror=enum-int-mismatch]
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c:1468:1: error: conflicting types for 'vchiq_release_internal' due to enum/integer mismatch; have 'int(struct vchiq_state *, struct vchiq_service *)' [-Werror=enum-int-mismatch]

Change the declarations to match the actual function definition.

Fixes: a9fbd828be7f ("staging: vchiq_arm: drop enum vchiq_status from vchiq_*_internal")
Cc: stable <stable@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20230117163957.1109872-1-arnd@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by Arnd Bergmann and committed by Greg Kroah-Hartman 7d832993 5dc4c995

options
unified split
Changed files
+3 -3
drivers
staging
vc04_services
include
linux
raspberrypi
vchiq.h
interface
vchiq_arm
vchiq_arm.h
+1 -1
drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
··· 86 86 87 87 struct vchiq_instance; 88 88 89 - extern enum vchiq_status vchiq_initialise(struct vchiq_instance **pinstance); 89 + extern int vchiq_initialise(struct vchiq_instance **pinstance); 90 90 extern enum vchiq_status vchiq_shutdown(struct vchiq_instance *instance); 91 91 extern enum vchiq_status vchiq_connect(struct vchiq_instance *instance); 92 92 extern enum vchiq_status vchiq_open_service(struct vchiq_instance *instance,
+2 -2
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
··· 100 100 extern void 101 101 vchiq_dump_service_use_state(struct vchiq_state *state); 102 102 103 - extern enum vchiq_status 103 + extern int 104 104 vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service, 105 105 enum USE_TYPE_E use_type); 106 - extern enum vchiq_status 106 + extern int 107 107 vchiq_release_internal(struct vchiq_state *state, 108 108 struct vchiq_service *service); 109 109