Commit 72662e79 authored by Weili Qian's avatar Weili Qian Committed by Zheng Zengkai
Browse files

crypto: hisilicon/hpre - change return type of hpre_cluster_inqry_write() 

mainline inclusion
from mainline-v6.1-rc1
commit 582b05bb
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5T7AD
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=582b05bba481d5798ef884f1396285ab47e426e1



----------------------------------------------------------------------

hpre_cluster_inqry_write() always returns 0. So change the type
of hpre_cluster_inqry_write() to void.

Signed-off-by: default avatarWeili Qian <qianweili@huawei.com>
Signed-off-by: default avatarYang Shen <shenyang39@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarJiangshui Yang <yangjiangshui@h-partners.com>
Reviewed-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Reviewed-by: default avatarYang Shen <shenyang39@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent ef09790a

drivers/crypto/hisilicon/hpre/hpre_main.c

+2 −6
Original line number Diff line number Diff line
@@ -708,7 +708,7 @@ static u32 hpre_cluster_inqry_read(struct hpre_debugfs_file *file) 
	return readl(qm->io_base + offset + HPRE_CLSTR_ADDR_INQRY_RSLT);

}



static int hpre_cluster_inqry_write(struct hpre_debugfs_file *file, u32 val)

static void hpre_cluster_inqry_write(struct hpre_debugfs_file *file, u32 val)

{

	struct hisi_qm *qm = hpre_file_to_qm(file);

	int cluster_index = file->index - HPRE_CLUSTER_CTRL;
@@ -716,8 +716,6 @@ static int hpre_cluster_inqry_write(struct hpre_debugfs_file *file, u32 val) 
			       HPRE_CLSTR_ADDR_INTRVL;



	writel(val, qm->io_base + offset + HPRE_CLUSTER_INQURY);



	return 0;

}



static ssize_t hpre_ctrl_debug_read(struct file *filp, char __user *buf,
@@ -792,9 +790,7 @@ static ssize_t hpre_ctrl_debug_write(struct file *filp, const char __user *buf, 
			goto err_input;

		break;

	case HPRE_CLUSTER_CTRL:

		ret = hpre_cluster_inqry_write(file, val);

		if (ret)

			goto err_input;

		hpre_cluster_inqry_write(file, val);

		break;

	default:

		ret = -EINVAL;