Unverified Commit 56d5a54e authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12720 drivers/crypto/ccp: fix a build error 

Merge Pull Request from: @geliangtang 
 
Fix a build error introduced by the commit 3ce4cb81 ("drivers/crypto/ccp: support TKM run on CSV"):

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,
      | ^~~~~~~~~~~~~~~
 
 
Link:https://gitee.com/openeuler/kernel/pulls/12720

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 72d0e640 bbc2cab1

include/linux/psp-hygon.h

+0 −4
Original line number Diff line number Diff line
@@ -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; }