Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

crypto: hisilicon/zip - fix some coding styles

1.Unified alignment styles
2.Remove unnecessary goto branch
3.Remove address printf

Signed-off-by: Yang Shen <shenyang39@huawei.com>
Reviewed-by: Zhou Wang <wangzhou1@hisilicon.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Yang Shen and committed by
Herbert Xu
2ca73193 2a928693

+11 -19
+7 -7
drivers/crypto/hisilicon/zip/zip_crypto.c
··· 38 38 #define HZIP_SGL_SGE_NR 10 39 39 40 40 static const u8 zlib_head[HZIP_ZLIB_HEAD_SIZE] = {0x78, 0x9c}; 41 - static const u8 gzip_head[HZIP_GZIP_HEAD_SIZE] = {0x1f, 0x8b, 0x08, 0x0, 0x0, 42 - 0x0, 0x0, 0x0, 0x0, 0x03}; 41 + static const u8 gzip_head[HZIP_GZIP_HEAD_SIZE] = { 42 + 0x1f, 0x8b, 0x08, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x03 43 + }; 44 + 43 45 enum hisi_zip_alg_type { 44 46 HZIP_ALG_TYPE_COMP = 0, 45 47 HZIP_ALG_TYPE_DECOMP = 1, ··· 361 359 362 360 atomic64_inc(&dfx->recv_cnt); 363 361 status = sqe->dw3 & HZIP_BD_STATUS_M; 364 - 365 362 if (status != 0 && status != HZIP_NC_ERR) { 366 363 dev_err(dev, "%scompress fail in qp%u: %u, output: %u\n", 367 364 (qp->alg_type == 0) ? "" : "de", qp->qp_id, status, ··· 521 520 struct hisi_acc_sgl_pool *pool = qp_ctx->sgl_pool; 522 521 struct hisi_zip_dfx *dfx = &qp_ctx->zip_dev->dfx; 523 522 struct hisi_zip_sqe zip_sqe; 524 - dma_addr_t input; 525 - dma_addr_t output; 523 + dma_addr_t input, output; 526 524 int ret; 527 525 528 526 if (!a_req->src || !a_req->slen || !a_req->dst || !a_req->dlen) ··· 540 540 (req->req_id << 1) + 1, 541 541 &output); 542 542 if (IS_ERR(req->hw_dst)) { 543 - dev_err(dev, "failed to map the dst buffer to hw slg (%ld)!\n", 544 - PTR_ERR(req->hw_dst)); 545 543 ret = PTR_ERR(req->hw_dst); 544 + dev_err(dev, "failed to map the dst buffer to hw slg (%d)!\n", 545 + ret); 546 546 goto err_unmap_input; 547 547 } 548 548 req->dma_dst = output;
+4 -12
drivers/crypto/hisilicon/zip/zip_main.c
··· 258 258 /* qm cache */ 259 259 writel(AXI_M_CFG, base + QM_AXI_M_CFG); 260 260 writel(AXI_M_CFG_ENABLE, base + QM_AXI_M_CFG_ENABLE); 261 + 261 262 /* disable FLR triggered by BME(bus master enable) */ 262 263 writel(PEH_AXUSER_CFG, base + QM_PEH_AXUSER_CFG); 263 264 writel(PEH_AXUSER_CFG_ENABLE, base + QM_PEH_AXUSER_CFG_ENABLE); ··· 312 311 writel(0x1, qm->io_base + HZIP_CORE_INT_RAS_CE_ENB); 313 312 writel(0x0, qm->io_base + HZIP_CORE_INT_RAS_FE_ENB); 314 313 writel(HZIP_CORE_INT_RAS_NFE_ENABLE, 315 - qm->io_base + HZIP_CORE_INT_RAS_NFE_ENB); 314 + qm->io_base + HZIP_CORE_INT_RAS_NFE_ENB); 316 315 317 316 /* enable ZIP hw error interrupts */ 318 317 writel(0, qm->io_base + HZIP_CORE_INT_MASK_REG); ··· 488 487 .write = hisi_zip_ctrl_debug_write, 489 488 }; 490 489 491 - 492 490 static int zip_debugfs_atomic64_set(void *data, u64 val) 493 491 { 494 492 if (val) ··· 632 632 while (err->msg) { 633 633 if (err->int_msk & err_sts) { 634 634 dev_err(dev, "%s [error status=0x%x] found\n", 635 - err->msg, err->int_msk); 635 + err->msg, err->int_msk); 636 636 637 637 if (err->int_msk & HZIP_CORE_INT_STATUS_M_ECC) { 638 638 err_val = readl(qm->io_base + ··· 640 640 dev_err(dev, "hisi-zip multi ecc sram num=0x%x\n", 641 641 ((err_val >> 642 642 HZIP_SRAM_ECC_ERR_NUM_SHIFT) & 0xFF)); 643 - dev_err(dev, "hisi-zip multi ecc sram addr=0x%x\n", 644 - (err_val >> 645 - HZIP_SRAM_ECC_ERR_ADDR_SHIFT)); 646 643 } 647 644 } 648 645 err++; ··· 899 902 900 903 ret = pci_register_driver(&hisi_zip_pci_driver); 901 904 if (ret < 0) { 905 + hisi_zip_unregister_debugfs(); 902 906 pr_err("Failed to register pci driver.\n"); 903 - goto err_pci; 904 907 } 905 - 906 - return 0; 907 - 908 - err_pci: 909 - hisi_zip_unregister_debugfs(); 910 908 911 909 return ret; 912 910 }