diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-04-19 01:18:48 +0900 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-04-27 18:35:02 +0900 |
commit | 57d1e5faf21c160c2dd3f152f5195a13ba8c7c70 (patch) | |
tree | 8182a07204157f4c04ff587641a2ba9df4bc9ade /plat/rockchip/common | |
parent | 724fd958c3f4507b2282524665a878f0169de864 (diff) | |
download | trusted-firmware-a-57d1e5faf21c160c2dd3f152f5195a13ba8c7c70.tar.gz |
Fix pointer type mismatch of handlers
Commit 4c0d03907652 ("Rework type usage in Trusted Firmware") changed
the type usage in struct declarations, but did not touch the definition
side. Fix the type mismatch.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'plat/rockchip/common')
-rw-r--r-- | plat/rockchip/common/rockchip_sip_svc.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/plat/rockchip/common/rockchip_sip_svc.c b/plat/rockchip/common/rockchip_sip_svc.c index eca4f99acc..24805994b0 100644 --- a/plat/rockchip/common/rockchip_sip_svc.c +++ b/plat/rockchip/common/rockchip_sip_svc.c @@ -18,14 +18,14 @@ DEFINE_SVC_UUID(rk_sip_svc_uid, 0x8f, 0x88, 0xee, 0x74, 0x7b, 0x72); #pragma weak rockchip_plat_sip_handler -uint64_t rockchip_plat_sip_handler(uint32_t smc_fid, - uint64_t x1, - uint64_t x2, - uint64_t x3, - uint64_t x4, - void *cookie, - void *handle, - uint64_t flags) +uintptr_t rockchip_plat_sip_handler(uint32_t smc_fid, + u_register_t x1, + u_register_t x2, + u_register_t x3, + u_register_t x4, + void *cookie, + void *handle, + u_register_t flags) { ERROR("%s: unhandled SMC (0x%x)\n", __func__, smc_fid); SMC_RET1(handle, SMC_UNK); @@ -34,14 +34,14 @@ uint64_t rockchip_plat_sip_handler(uint32_t smc_fid, /* * This function is responsible for handling all SiP calls from the NS world */ -uint64_t sip_smc_handler(uint32_t smc_fid, - uint64_t x1, - uint64_t x2, - uint64_t x3, - uint64_t x4, - void *cookie, - void *handle, - uint64_t flags) +uintptr_t sip_smc_handler(uint32_t smc_fid, + u_register_t x1, + u_register_t x2, + u_register_t x3, + u_register_t x4, + void *cookie, + void *handle, + u_register_t flags) { uint32_t ns; |