Skip to content

Commit d2c8655

Browse files
committed
firmware: zynqmp: fix declarations for gcc-13
gcc-13.0.1 reports a type mismatch for two functions: drivers/firmware/xilinx/zynqmp.c:1228:5: error: conflicting types for 'zynqmp_pm_set_rpu_mode' due to enum/integer mismatch; have 'int(u32, enum rpu_oper_mode)' {aka 'int(unsigned int, enum rpu_oper_mode)'} [-Werror=enum-int-mismatch] 1228 | int zynqmp_pm_set_rpu_mode(u32 node_id, enum rpu_oper_mode rpu_mode) | ^~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/firmware/xilinx/zynqmp.c:25: include/linux/firmware/xlnx-zynqmp.h:552:5: note: previous declaration of 'zynqmp_pm_set_rpu_mode' with type 'int(u32, u32)' {aka 'int(unsigned int, unsigned int)'} 552 | int zynqmp_pm_set_rpu_mode(u32 node_id, u32 arg1); | ^~~~~~~~~~~~~~~~~~~~~~ drivers/firmware/xilinx/zynqmp.c:1246:5: error: conflicting types for 'zynqmp_pm_set_tcm_config' due to enum/integer mismatch; have 'int(u32, enum rpu_tcm_comb)' {aka 'int(unsigned int, enum rpu_tcm_comb)'} [-Werror=enum-int-mismatch] 1246 | int zynqmp_pm_set_tcm_config(u32 node_id, enum rpu_tcm_comb tcm_mode) | ^~~~~~~~~~~~~~~~~~~~~~~~ include/linux/firmware/xlnx-zynqmp.h:553:5: note: previous declaration of 'zynqmp_pm_set_tcm_config' with type 'int(u32, u32)' {aka 'int(unsigned int, unsigned int)'} 553 | int zynqmp_pm_set_tcm_config(u32 node_id, u32 arg1); | ^~~~~~~~~~~~~~~~~~~~~~~~ Change the declaration in the header to match the function definition. Acked-by: Michal Simek <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent aca5d87 commit d2c8655

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

include/linux/firmware/xlnx-zynqmp.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -545,8 +545,8 @@ int zynqmp_pm_request_wake(const u32 node,
545545
const u64 address,
546546
const enum zynqmp_pm_request_ack ack);
547547
int zynqmp_pm_get_rpu_mode(u32 node_id, enum rpu_oper_mode *rpu_mode);
548-
int zynqmp_pm_set_rpu_mode(u32 node_id, u32 arg1);
549-
int zynqmp_pm_set_tcm_config(u32 node_id, u32 arg1);
548+
int zynqmp_pm_set_rpu_mode(u32 node_id, enum rpu_oper_mode rpu_mode);
549+
int zynqmp_pm_set_tcm_config(u32 node_id, enum rpu_tcm_comb tcm_mode);
550550
int zynqmp_pm_set_sd_config(u32 node, enum pm_sd_config_type config, u32 value);
551551
int zynqmp_pm_set_gem_config(u32 node, enum pm_gem_config_type config,
552552
u32 value);
@@ -845,12 +845,12 @@ static inline int zynqmp_pm_get_rpu_mode(u32 node_id, enum rpu_oper_mode *rpu_mo
845845
return -ENODEV;
846846
}
847847

848-
static inline int zynqmp_pm_set_rpu_mode(u32 node_id, u32 arg1)
848+
static inline int zynqmp_pm_set_rpu_mode(u32 node_id, enum rpu_oper_mode rpu_mode)
849849
{
850850
return -ENODEV;
851851
}
852852

853-
static inline int zynqmp_pm_set_tcm_config(u32 node_id, u32 arg1)
853+
static inline int zynqmp_pm_set_tcm_config(u32 node_id, enum rpu_tcm_comb tcm_mode)
854854
{
855855
return -ENODEV;
856856
}

0 commit comments

Comments
 (0)