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

Configure Feed

Select the types of activity you want to include in your feed.

crypto: hisilicon/qm - fix the coding specifications issue

Ensure that the inline function contains no more than 10 lines.
move q_num_set() from hisi_acc_qm.h to qm.c.

Signed-off-by: Chenghai Huang <huangchenghai2@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Chenghai Huang and committed by
Herbert Xu 452c55dc 4fbc1338

+36 -34
+1 -1
drivers/crypto/hisilicon/hpre/hpre_main.c
··· 415 415 { 416 416 pf_q_num_flag = true; 417 417 418 - return q_num_set(val, kp, PCI_DEVICE_ID_HUAWEI_HPRE_PF); 418 + return hisi_qm_q_num_set(val, kp, PCI_DEVICE_ID_HUAWEI_HPRE_PF); 419 419 } 420 420 421 421 static const struct kernel_param_ops hpre_pf_q_num_ops = {
+31
drivers/crypto/hisilicon/qm.c
··· 451 451 452 452 static void qm_irqs_unregister(struct hisi_qm *qm); 453 453 static int qm_reset_device(struct hisi_qm *qm); 454 + int hisi_qm_q_num_set(const char *val, const struct kernel_param *kp, 455 + unsigned int device) 456 + { 457 + struct pci_dev *pdev; 458 + u32 n, q_num; 459 + int ret; 460 + 461 + if (!val) 462 + return -EINVAL; 463 + 464 + pdev = pci_get_device(PCI_VENDOR_ID_HUAWEI, device, NULL); 465 + if (!pdev) { 466 + q_num = min_t(u32, QM_QNUM_V1, QM_QNUM_V2); 467 + pr_info("No device found currently, suppose queue number is %u\n", 468 + q_num); 469 + } else { 470 + if (pdev->revision == QM_HW_V1) 471 + q_num = QM_QNUM_V1; 472 + else 473 + q_num = QM_QNUM_V2; 474 + 475 + pci_dev_put(pdev); 476 + } 477 + 478 + ret = kstrtou32(val, 10, &n); 479 + if (ret || n < QM_MIN_QNUM || n > q_num) 480 + return -EINVAL; 481 + 482 + return param_set_int(val, kp); 483 + } 484 + EXPORT_SYMBOL_GPL(hisi_qm_q_num_set); 454 485 455 486 static u32 qm_get_hw_error_status(struct hisi_qm *qm) 456 487 {
+1 -1
drivers/crypto/hisilicon/sec2/sec_main.c
··· 322 322 { 323 323 pf_q_num_flag = true; 324 324 325 - return q_num_set(val, kp, PCI_DEVICE_ID_HUAWEI_SEC_PF); 325 + return hisi_qm_q_num_set(val, kp, PCI_DEVICE_ID_HUAWEI_SEC_PF); 326 326 } 327 327 328 328 static const struct kernel_param_ops sec_pf_q_num_ops = {
+1 -1
drivers/crypto/hisilicon/zip/zip_main.c
··· 402 402 { 403 403 pf_q_num_flag = true; 404 404 405 - return q_num_set(val, kp, PCI_DEVICE_ID_HUAWEI_ZIP_PF); 405 + return hisi_qm_q_num_set(val, kp, PCI_DEVICE_ID_HUAWEI_ZIP_PF); 406 406 } 407 407 408 408 static const struct kernel_param_ops pf_q_num_ops = {
+2 -31
include/linux/hisi_acc_qm.h
··· 436 436 struct uacce_queue *uacce_q; 437 437 }; 438 438 439 - static inline int q_num_set(const char *val, const struct kernel_param *kp, 440 - unsigned int device) 441 - { 442 - struct pci_dev *pdev; 443 - u32 n, q_num; 444 - int ret; 445 - 446 - if (!val) 447 - return -EINVAL; 448 - 449 - pdev = pci_get_device(PCI_VENDOR_ID_HUAWEI, device, NULL); 450 - if (!pdev) { 451 - q_num = min_t(u32, QM_QNUM_V1, QM_QNUM_V2); 452 - pr_info("No device found currently, suppose queue number is %u\n", 453 - q_num); 454 - } else { 455 - if (pdev->revision == QM_HW_V1) 456 - q_num = QM_QNUM_V1; 457 - else 458 - q_num = QM_QNUM_V2; 459 - 460 - pci_dev_put(pdev); 461 - } 462 - 463 - ret = kstrtou32(val, 10, &n); 464 - if (ret || n < QM_MIN_QNUM || n > q_num) 465 - return -EINVAL; 466 - 467 - return param_set_int(val, kp); 468 - } 469 - 470 439 static inline int vfs_num_set(const char *val, const struct kernel_param *kp) 471 440 { 472 441 u32 n; ··· 495 526 mutex_unlock(&qm_list->lock); 496 527 } 497 528 529 + int hisi_qm_q_num_set(const char *val, const struct kernel_param *kp, 530 + unsigned int device); 498 531 int hisi_qm_init(struct hisi_qm *qm); 499 532 void hisi_qm_uninit(struct hisi_qm *qm); 500 533 int hisi_qm_start(struct hisi_qm *qm);