Commit 362c50ba authored by Kai Ye's avatar Kai Ye Committed by Herbert Xu
Browse files

crypto: hisilicon/qm - merges the work initialization process into a single function 



Merges the work initialization process into a single function from
qm initialization.

Signed-off-by: default avatarKai Ye <yekai13@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent cc0c40c6

drivers/crypto/hisilicon/qm.c

+11 −7
Original line number Diff line number Diff line
@@ -5317,6 +5317,16 @@ static int hisi_qm_pci_init(struct hisi_qm *qm) 
	return ret;

}



static void hisi_qm_init_work(struct hisi_qm *qm)

{

	INIT_WORK(&qm->work, qm_work_process);

	if (qm->fun_type == QM_HW_PF)

		INIT_WORK(&qm->rst_work, hisi_qm_controller_reset);



	if (qm->ver > QM_HW_V2)

		INIT_WORK(&qm->cmd_process, qm_cmd_process);

}



static int hisi_qp_alloc_memory(struct hisi_qm *qm)

{

	struct device *dev = &qm->pdev->dev;
@@ -5432,13 +5442,7 @@ int hisi_qm_init(struct hisi_qm *qm) 
	if (ret)

		goto err_alloc_uacce;



	INIT_WORK(&qm->work, qm_work_process);

	if (qm->fun_type == QM_HW_PF)

		INIT_WORK(&qm->rst_work, hisi_qm_controller_reset);



	if (qm->ver >= QM_HW_V3)

		INIT_WORK(&qm->cmd_process, qm_cmd_process);



	hisi_qm_init_work(qm);

	qm_cmd_init(qm);

	atomic_set(&qm->status.flags, QM_INIT);