Commit 2ce167cb authored by Weili Qian's avatar Weili Qian Committed by JiangShui
Browse files

crypto: hisilicon/qm - fix coding style issues 

mainline inclusion
from mainline-v6.3-rc1
commit ced18fd1
category: feature
bugzilla: https://gitee/com/openeuler/kernel/issues/16VW8E
CVE: NA

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



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

1. Remove extra blank lines.
2. Remove extra spaces.
3. Use spaces instead of tabs around '=' and '\',
to ensure consistent coding styles.
4. Macros should be capital letters, change 'QM_SQC_VFT_NUM_MASK_v2'
to 'QM_SQC_VFT_NUM_MASK_V2'.

Signed-off-by: default avatarWeili Qian <qianweili@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarJangShui <yangjiangshui@h-partners.com>
parent 86a346fb

drivers/crypto/hisilicon/qm.c

+12 −17
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ 
#define QM_SQC_VFT_BASE_SHIFT_V2	28

#define QM_SQC_VFT_BASE_MASK_V2		GENMASK(15, 0)

#define QM_SQC_VFT_NUM_SHIFT_V2		45

#define QM_SQC_VFT_NUM_MASK_v2		GENMASK(9, 0)

#define QM_SQC_VFT_NUM_MASK_V2		GENMASK(9, 0)



#define QM_ABNORMAL_INT_SOURCE		0x100000

#define QM_ABNORMAL_INT_MASK		0x100004
@@ -1304,7 +1304,7 @@ static int qm_get_vft_v2(struct hisi_qm *qm, u32 *base, u32 *number) 
	sqc_vft = readl(qm->io_base + QM_MB_CMD_DATA_ADDR_L) |

		  ((u64)readl(qm->io_base + QM_MB_CMD_DATA_ADDR_H) << 32);

	*base = QM_SQC_VFT_BASE_MASK_V2 & (sqc_vft >> QM_SQC_VFT_BASE_SHIFT_V2);

	*number = (QM_SQC_VFT_NUM_MASK_v2 &

	*number = (QM_SQC_VFT_NUM_MASK_V2 &

		   (sqc_vft >> QM_SQC_VFT_NUM_SHIFT_V2)) + 1;



	return 0;
@@ -3197,7 +3197,6 @@ static int qm_stop_started_qp(struct hisi_qm *qm) 
	return 0;

}





/**

 * qm_clear_queues() - Clear all queues memory in a qm.

 * @qm: The qm in which the queues will be cleared.
@@ -4180,13 +4179,10 @@ static void qm_dev_ecc_mbit_handle(struct hisi_qm *qm) 
	if (!qm->err_status.is_dev_ecc_mbit &&

	    qm->err_status.is_qm_ecc_mbit &&

	    qm->err_ini->close_axi_master_ooo) {



		qm->err_ini->close_axi_master_ooo(qm);



	} else if (qm->err_status.is_dev_ecc_mbit &&

		   !qm->err_status.is_qm_ecc_mbit &&

		   !qm->err_ini->close_axi_master_ooo) {



		nfe_enb = readl(qm->io_base + QM_RAS_NFE_ENABLE);

		writel(nfe_enb & QM_RAS_NFE_MBIT_DISABLE,

		       qm->io_base + QM_RAS_NFE_ENABLE);
@@ -4634,7 +4630,6 @@ static irqreturn_t qm_abnormal_irq(int irq, void *data) 
	return IRQ_HANDLED;

}





/**

 * hisi_qm_dev_shutdown() - Shutdown device.

 * @pdev: The device will be shutdown.

drivers/crypto/hisilicon/sgl.c

+0 −1
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ hisi_acc_sg_buf_map_to_hw_sgl(struct device *dev, 
		dev_err(dev, "Get SGL error!\n");

		dma_unmap_sg(dev, sgl, sg_n, DMA_BIDIRECTIONAL);

		return ERR_PTR(-ENOMEM);



	}

	curr_hw_sgl->entry_length_in_sgl = cpu_to_le16(pool->sge_nr);

	curr_hw_sge = curr_hw_sgl->sge_entries;