From: Quanyang Wang <[email protected]>

With gcc-13, the following mismatch is reported:

drivers/firmware/xilinx/zynqmp.c:1817:5: warning: 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)’} 
[-Wenum-int-mismatch]
 1817 | int zynqmp_pm_set_rpu_mode(u32 node_id, enum rpu_oper_mode rpu_mode)
      |     ^~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/firmware/xilinx/zynqmp.c:28:
./include/linux/firmware/xlnx-zynqmp.h:756:5: note: previous declaration of 
‘zynqmp_pm_set_rpu_mode’ with type ‘int(u32,  u32)’ {aka ‘int(unsigned int,  
unsigned int)’}
  756 | int zynqmp_pm_set_rpu_mode(u32 node_id, u32 arg1);
      |     ^~~~~~~~~~~~~~~~~~~~~~
drivers/firmware/xilinx/zynqmp.c:1835:5: warning: 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)’} 
[-Wenum-int-mismatch]
 1835 | int zynqmp_pm_set_tcm_config(u32 node_id, enum rpu_tcm_comb tcm_mode)
      |     ^~~~~~~~~~~~~~~~~~~~~~~~
  CC      drivers/firmware/efi/libstub/string.o
./include/linux/firmware/xlnx-zynqmp.h:757:5: note: previous declaration of 
‘zynqmp_pm_set_tcm_config’ with type ‘int(u32,  u32)’ {aka ‘int(unsigned int,  
unsigned int)’}
  757 | int zynqmp_pm_set_tcm_config(u32 node_id, u32 arg1);
      |     ^~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Quanyang Wang <[email protected]>
---
Hi Bruce,
Would you please help merge this patch to the branches:
        v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
        v6.1/standard/sdkv6.1/xlnx-soc
Thanks,
Quanyang
---
 include/linux/firmware/xlnx-zynqmp.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/firmware/xlnx-zynqmp.h 
b/include/linux/firmware/xlnx-zynqmp.h
index 7a650e3111991..dea03368a55bc 100644
--- a/include/linux/firmware/xlnx-zynqmp.h
+++ b/include/linux/firmware/xlnx-zynqmp.h
@@ -755,8 +755,8 @@ int zynqmp_pm_request_wake(const u32 node,
                           const u64 address,
                           const enum zynqmp_pm_request_ack ack);
 int zynqmp_pm_get_rpu_mode(u32 node_id, enum rpu_oper_mode *rpu_mode);
-int zynqmp_pm_set_rpu_mode(u32 node_id, u32 arg1);
-int zynqmp_pm_set_tcm_config(u32 node_id, u32 arg1);
+int zynqmp_pm_set_rpu_mode(u32 node_id, enum rpu_oper_mode arg1);
+int zynqmp_pm_set_tcm_config(u32 node_id, enum rpu_tcm_comb arg1);
 int zynqmp_pm_pinctrl_request(const u32 pin);
 int zynqmp_pm_pinctrl_release(const u32 pin);
 int zynqmp_pm_pinctrl_get_function(const u32 pin, u32 *id);
-- 
2.36.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13111): 
https://lists.yoctoproject.org/g/linux-yocto/message/13111
Mute This Topic: https://lists.yoctoproject.org/mt/101590471/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to