From bbc2cab152d1fd85147e7ebe22b159379e56602f Mon Sep 17 00:00:00 2001 From: Geliang Tang Date: Wed, 30 Oct 2024 16:00:57 +0800 Subject: [PATCH] drivers/crypto/ccp: fix a build error openEuler inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IB0VHS CVE: NA -------------------------------- include/linux/psp-hygon.h:435:1: error: conflicting types for 'vpsp_try_do_cmd'; have 'int(int, phys_addr_t, struct vpsp_ret *)' {aka 'int(int, long long unsigned int, struct vpsp_ret *)'} 435 | vpsp_try_do_cmd(int cmd, phys_addr_t phy_addr, | ^~~~~~~~~~~~~~~ include/linux/psp-hygon.h:431:1: note: previous definition of 'vpsp_try_do_cmd' with type 'int(uint32_t, int, void *, struct vpsp_ret *)' {aka 'int(unsigned int, int, void *, struct vpsp_ret *)'} 431 | vpsp_try_do_cmd(uint32_t vid, int cmd, | ^~~~~~~~~~~~~~~ Fixes: 3ce4cb81ef2b ("drivers/crypto/ccp: support TKM run on CSV") Signed-off-by: Geliang Tang --- include/linux/psp-hygon.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/linux/psp-hygon.h b/include/linux/psp-hygon.h index 7d734ce7eea7..dd52be59e29f 100644 --- a/include/linux/psp-hygon.h +++ b/include/linux/psp-hygon.h @@ -427,10 +427,6 @@ static inline int vpsp_try_get_result(uint8_t prio, uint32_t index, phys_addr_t phy_addr, struct vpsp_ret *psp_ret) { return -ENODEV; } -static inline int -vpsp_try_do_cmd(uint32_t vid, int cmd, - void *data, struct vpsp_ret *psp_ret) { return -ENODEV; } - static inline int vpsp_try_do_cmd(int cmd, phys_addr_t phy_addr, struct vpsp_ret *psp_ret) { return -ENODEV; } -- Gitee