Skip to content

Commit 7d83299

Browse files
arndbgregkh
authored andcommitted
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: a9fbd82 ("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>
1 parent 5dc4c99 commit 7d83299

File tree

2 files changed

+3
-3
lines changed
  • drivers/staging/vc04_services

2 files changed

+3
-3
lines changed

drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ struct vchiq_service_params_kernel {
8686

8787
struct vchiq_instance;
8888

89-
extern enum vchiq_status vchiq_initialise(struct vchiq_instance **pinstance);
89+
extern int vchiq_initialise(struct vchiq_instance **pinstance);
9090
extern enum vchiq_status vchiq_shutdown(struct vchiq_instance *instance);
9191
extern enum vchiq_status vchiq_connect(struct vchiq_instance *instance);
9292
extern enum vchiq_status vchiq_open_service(struct vchiq_instance *instance,

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ vchiq_dump_platform_use_state(struct vchiq_state *state);
100100
extern void
101101
vchiq_dump_service_use_state(struct vchiq_state *state);
102102

103-
extern enum vchiq_status
103+
extern int
104104
vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service,
105105
enum USE_TYPE_E use_type);
106-
extern enum vchiq_status
106+
extern int
107107
vchiq_release_internal(struct vchiq_state *state,
108108
struct vchiq_service *service);
109109

0 commit comments

Comments
 (0)