Skip to content

Commit ced18fd

Browse files
Weili Qianherbertx
authored andcommitted
crypto: hisilicon/qm - fix coding style issues
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: Weili Qian <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
1 parent 9b4eb8f commit ced18fd

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

drivers/crypto/hisilicon/qm.c

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
#define QM_SQC_VFT_BASE_SHIFT_V2 28
117117
#define QM_SQC_VFT_BASE_MASK_V2 GENMASK(15, 0)
118118
#define QM_SQC_VFT_NUM_SHIFT_V2 45
119-
#define QM_SQC_VFT_NUM_MASK_v2 GENMASK(9, 0)
119+
#define QM_SQC_VFT_NUM_MASK_V2 GENMASK(9, 0)
120120

121121
#define QM_ABNORMAL_INT_SOURCE 0x100000
122122
#define QM_ABNORMAL_INT_MASK 0x100004
@@ -230,23 +230,23 @@
230230
#define QM_AUTOSUSPEND_DELAY 3000
231231

232232
#define QM_MK_CQC_DW3_V1(hop_num, pg_sz, buf_sz, cqe_sz) \
233-
(((hop_num) << QM_CQ_HOP_NUM_SHIFT) | \
234-
((pg_sz) << QM_CQ_PAGE_SIZE_SHIFT) | \
235-
((buf_sz) << QM_CQ_BUF_SIZE_SHIFT) | \
233+
(((hop_num) << QM_CQ_HOP_NUM_SHIFT) | \
234+
((pg_sz) << QM_CQ_PAGE_SIZE_SHIFT) | \
235+
((buf_sz) << QM_CQ_BUF_SIZE_SHIFT) | \
236236
((cqe_sz) << QM_CQ_CQE_SIZE_SHIFT))
237237

238238
#define QM_MK_CQC_DW3_V2(cqe_sz, cq_depth) \
239239
((((u32)cq_depth) - 1) | ((cqe_sz) << QM_CQ_CQE_SIZE_SHIFT))
240240

241241
#define QM_MK_SQC_W13(priority, orders, alg_type) \
242-
(((priority) << QM_SQ_PRIORITY_SHIFT) | \
243-
((orders) << QM_SQ_ORDERS_SHIFT) | \
242+
(((priority) << QM_SQ_PRIORITY_SHIFT) | \
243+
((orders) << QM_SQ_ORDERS_SHIFT) | \
244244
(((alg_type) & QM_SQ_TYPE_MASK) << QM_SQ_TYPE_SHIFT))
245245

246246
#define QM_MK_SQC_DW3_V1(hop_num, pg_sz, buf_sz, sqe_sz) \
247-
(((hop_num) << QM_SQ_HOP_NUM_SHIFT) | \
248-
((pg_sz) << QM_SQ_PAGE_SIZE_SHIFT) | \
249-
((buf_sz) << QM_SQ_BUF_SIZE_SHIFT) | \
247+
(((hop_num) << QM_SQ_HOP_NUM_SHIFT) | \
248+
((pg_sz) << QM_SQ_PAGE_SIZE_SHIFT) | \
249+
((buf_sz) << QM_SQ_BUF_SIZE_SHIFT) | \
250250
((u32)ilog2(sqe_sz) << QM_SQ_SQE_SIZE_SHIFT))
251251

252252
#define QM_MK_SQC_DW3_V2(sqe_sz, sq_depth) \
@@ -696,7 +696,7 @@ static void qm_db_v2(struct hisi_qm *qm, u16 qn, u8 cmd, u16 index, u8 priority)
696696

697697
doorbell = qn | ((u64)cmd << QM_DB_CMD_SHIFT_V2) |
698698
((u64)randata << QM_DB_RAND_SHIFT_V2) |
699-
((u64)index << QM_DB_INDEX_SHIFT_V2) |
699+
((u64)index << QM_DB_INDEX_SHIFT_V2) |
700700
((u64)priority << QM_DB_PRIORITY_SHIFT_V2);
701701

702702
writeq(doorbell, io_base);
@@ -1294,7 +1294,7 @@ static int qm_get_vft_v2(struct hisi_qm *qm, u32 *base, u32 *number)
12941294
sqc_vft = readl(qm->io_base + QM_MB_CMD_DATA_ADDR_L) |
12951295
((u64)readl(qm->io_base + QM_MB_CMD_DATA_ADDR_H) << 32);
12961296
*base = QM_SQC_VFT_BASE_MASK_V2 & (sqc_vft >> QM_SQC_VFT_BASE_SHIFT_V2);
1297-
*number = (QM_SQC_VFT_NUM_MASK_v2 &
1297+
*number = (QM_SQC_VFT_NUM_MASK_V2 &
12981298
(sqc_vft >> QM_SQC_VFT_NUM_SHIFT_V2)) + 1;
12991299

13001300
return 0;
@@ -3063,7 +3063,6 @@ static int qm_stop_started_qp(struct hisi_qm *qm)
30633063
return 0;
30643064
}
30653065

3066-
30673066
/**
30683067
* qm_clear_queues() - Clear all queues memory in a qm.
30693068
* @qm: The qm in which the queues will be cleared.
@@ -3547,7 +3546,7 @@ static ssize_t qm_algqos_read(struct file *filp, char __user *buf,
35473546
qos_val = ir / QM_QOS_RATE;
35483547
ret = scnprintf(tbuf, QM_DBG_READ_LEN, "%u\n", qos_val);
35493548

3550-
ret = simple_read_from_buffer(buf, count, pos, tbuf, ret);
3549+
ret = simple_read_from_buffer(buf, count, pos, tbuf, ret);
35513550

35523551
err_get_status:
35533552
clear_bit(QM_RESETTING, &qm->misc_ctl);
@@ -4038,13 +4037,10 @@ static void qm_dev_ecc_mbit_handle(struct hisi_qm *qm)
40384037
if (!qm->err_status.is_dev_ecc_mbit &&
40394038
qm->err_status.is_qm_ecc_mbit &&
40404039
qm->err_ini->close_axi_master_ooo) {
4041-
40424040
qm->err_ini->close_axi_master_ooo(qm);
4043-
40444041
} else if (qm->err_status.is_dev_ecc_mbit &&
40454042
!qm->err_status.is_qm_ecc_mbit &&
40464043
!qm->err_ini->close_axi_master_ooo) {
4047-
40484044
nfe_enb = readl(qm->io_base + QM_RAS_NFE_ENABLE);
40494045
writel(nfe_enb & QM_RAS_NFE_MBIT_DISABLE,
40504046
qm->io_base + QM_RAS_NFE_ENABLE);
@@ -4488,7 +4484,6 @@ static irqreturn_t qm_abnormal_irq(int irq, void *data)
44884484
return IRQ_HANDLED;
44894485
}
44904486

4491-
44924487
/**
44934488
* hisi_qm_dev_shutdown() - Shutdown device.
44944489
* @pdev: The device will be shutdown.

drivers/crypto/hisilicon/sgl.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ hisi_acc_sg_buf_map_to_hw_sgl(struct device *dev,
250250
dev_err(dev, "Get SGL error!\n");
251251
dma_unmap_sg(dev, sgl, sg_n, DMA_BIDIRECTIONAL);
252252
return ERR_PTR(-ENOMEM);
253-
254253
}
255254
curr_hw_sgl->entry_length_in_sgl = cpu_to_le16(pool->sge_nr);
256255
curr_hw_sge = curr_hw_sgl->sge_entries;

0 commit comments

Comments
 (0)