crypto: hisilicon - tiny fix about QM/ZIP error callback print

Tiny fix to make QM/ZIP error callback print clear and right. If one version
hardware does not support error handling, we directly print this.

And QM is embedded in ZIP, we can use ZIP print only, so remove unnecessary
QM print.

Signed-off-by: Zhou Wang <wangzhou1@hisilicon.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 a8ed699081b7fa225ee5144cb9c354c58fab5103..2c17bf3359fc6d5333a4677cefd3bb0206e48d87 100644 (file)
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -987,9 +987,6 @@ static int qm_create_debugfs_file(struct hisi_qm *qm, enum qm_debug_file index)
 static void qm_hw_error_init_v1(struct hisi_qm *qm, u32 ce, u32 nfe, u32 fe,
                                u32 msi)
 {
-       dev_info(&qm->pdev->dev,
-                "QM v%d does not support hw error handle\n", qm->ver);
-
        writel(QM_ABNORMAL_INT_MASK_VALUE, qm->io_base + QM_ABNORMAL_INT_MASK);
 }
 
@@ -1868,8 +1865,7 @@ void hisi_qm_hw_error_init(struct hisi_qm *qm, u32 ce, u32 nfe, u32 fe,
                           u32 msi)
 {
        if (!qm->ops->hw_error_init) {
-               dev_err(&qm->pdev->dev, "QM version %d doesn't support hw error handling!\n",
-                       qm->ver);
+               dev_err(&qm->pdev->dev, "QM doesn't support hw error handling!\n");
                return;
        }
 
@@ -1886,8 +1882,7 @@ EXPORT_SYMBOL_GPL(hisi_qm_hw_error_init);
 int hisi_qm_hw_error_handle(struct hisi_qm *qm)
 {
        if (!qm->ops->hw_error_handle) {
-               dev_err(&qm->pdev->dev, "QM version %d doesn't support hw error report!\n",
-                       qm->ver);
+               dev_err(&qm->pdev->dev, "QM doesn't support hw error report!\n");
                return PCI_ERS_RESULT_NONE;
        }
 

diff --git a/drivers/crypto/hisilicon/zip/zip_main.c b/drivers/crypto/hisilicon/zip/zip_main.c
index 1b2ee96c888d52c420e06e4d641320204659b778..5546edc6f7893c6cc5c50b7d5247935a821374c7 100644 (file)
--- a/drivers/crypto/hisilicon/zip/zip_main.c
+++ b/drivers/crypto/hisilicon/zip/zip_main.c
@@ -335,8 +335,7 @@ static void hisi_zip_hw_error_set_state(struct hisi_zip *hisi_zip, bool state)
 
        if (qm->ver == QM_HW_V1) {
                writel(HZIP_CORE_INT_DISABLE, qm->io_base + HZIP_CORE_INT_MASK);
-               dev_info(&qm->pdev->dev, "ZIP v%d does not support hw error handle\n",
-                        qm->ver);
+               dev_info(&qm->pdev->dev, "Does not support hw error handle\n");
                return;
        }