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 <qianweili@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
index 2f888e5..59823ad 100644 (file)
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -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
@@ -230,23 +230,23 @@
 #define QM_AUTOSUSPEND_DELAY           3000
 
 #define QM_MK_CQC_DW3_V1(hop_num, pg_sz, buf_sz, cqe_sz) \
-       (((hop_num) << QM_CQ_HOP_NUM_SHIFT)     | \
-       ((pg_sz) << QM_CQ_PAGE_SIZE_SHIFT)      | \
-       ((buf_sz) << QM_CQ_BUF_SIZE_SHIFT)      | \
+       (((hop_num) << QM_CQ_HOP_NUM_SHIFT) | \
+       ((pg_sz) << QM_CQ_PAGE_SIZE_SHIFT) | \
+       ((buf_sz) << QM_CQ_BUF_SIZE_SHIFT) | \
        ((cqe_sz) << QM_CQ_CQE_SIZE_SHIFT))
 
 #define QM_MK_CQC_DW3_V2(cqe_sz, cq_depth) \
        ((((u32)cq_depth) - 1) | ((cqe_sz) << QM_CQ_CQE_SIZE_SHIFT))
 
 #define QM_MK_SQC_W13(priority, orders, alg_type) \
-       (((priority) << QM_SQ_PRIORITY_SHIFT)   | \
-       ((orders) << QM_SQ_ORDERS_SHIFT)        | \
+       (((priority) << QM_SQ_PRIORITY_SHIFT) | \
+       ((orders) << QM_SQ_ORDERS_SHIFT) | \
        (((alg_type) & QM_SQ_TYPE_MASK) << QM_SQ_TYPE_SHIFT))
 
 #define QM_MK_SQC_DW3_V1(hop_num, pg_sz, buf_sz, sqe_sz) \
-       (((hop_num) << QM_SQ_HOP_NUM_SHIFT)     | \
-       ((pg_sz) << QM_SQ_PAGE_SIZE_SHIFT)      | \
-       ((buf_sz) << QM_SQ_BUF_SIZE_SHIFT)      | \
+       (((hop_num) << QM_SQ_HOP_NUM_SHIFT) | \
+       ((pg_sz) << QM_SQ_PAGE_SIZE_SHIFT) | \
+       ((buf_sz) << QM_SQ_BUF_SIZE_SHIFT) | \
        ((u32)ilog2(sqe_sz) << QM_SQ_SQE_SIZE_SHIFT))
 
 #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)
 
        doorbell = qn | ((u64)cmd << QM_DB_CMD_SHIFT_V2) |
                   ((u64)randata << QM_DB_RAND_SHIFT_V2) |
-                  ((u64)index << QM_DB_INDEX_SHIFT_V2)  |
+                  ((u64)index << QM_DB_INDEX_SHIFT_V2) |
                   ((u64)priority << QM_DB_PRIORITY_SHIFT_V2);
 
        writeq(doorbell, io_base);
@@ -1294,7 +1294,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;
@@ -3063,7 +3063,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.
@@ -3547,7 +3546,7 @@ static ssize_t qm_algqos_read(struct file *filp, char __user *buf,
        qos_val = ir / QM_QOS_RATE;
        ret = scnprintf(tbuf, QM_DBG_READ_LEN, "%u\n", qos_val);
 
-       ret =  simple_read_from_buffer(buf, count, pos, tbuf, ret);
+       ret = simple_read_from_buffer(buf, count, pos, tbuf, ret);
 
 err_get_status:
        clear_bit(QM_RESETTING, &qm->misc_ctl);
@@ -4038,13 +4037,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);
@@ -4488,7 +4484,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.

diff --git a/drivers/crypto/hisilicon/sgl.c b/drivers/crypto/hisilicon/sgl.c
index 2b6f228..a07257a 100644 (file)
--- a/drivers/crypto/hisilicon/sgl.c
+++ b/drivers/crypto/hisilicon/sgl.c
@@ -250,7 +250,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;