crypto: qat - changed adf_dev_stop to void

It returns always zero anyway.

Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

10 files changed, 17 insertions, 47 deletions

diff --git a/drivers/crypto/qat/qat_c3xxx/adf_drv.c b/drivers/crypto/qat/qat_c3xxx/adf_drv.c
index e13bd08ddd1e..640c3fc870fd 100644
--- a/drivers/crypto/qat/qat_c3xxx/adf_drv.c
+++ b/drivers/crypto/qat/qat_c3xxx/adf_drv.c
@@ -300,9 +300,7 @@ static void adf_remove(struct pci_dev *pdev)
                 pr_err("QAT: Driver removal failed\n");
                 return;
         }
-        if (adf_dev_stop(accel_dev))
-                dev_err(&GET_DEV(accel_dev), "Failed to stop QAT accel dev\n");
-
+        adf_dev_stop(accel_dev);
         adf_dev_shutdown(accel_dev);
         adf_disable_aer(accel_dev);
         adf_cleanup_accel(accel_dev);
diff --git a/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c b/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c
index 1ac4ae90e072..a998981e9610 100644
--- a/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c
+++ b/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c
@@ -270,9 +270,7 @@ static void adf_remove(struct pci_dev *pdev)
                 pr_err("QAT: Driver removal failed\n");
                 return;
         }
-        if (adf_dev_stop(accel_dev))
-                dev_err(&GET_DEV(accel_dev), "Failed to stop QAT accel dev\n");
-
+        adf_dev_stop(accel_dev);
         adf_dev_shutdown(accel_dev);
         adf_cleanup_accel(accel_dev);
         adf_cleanup_pci_dev(accel_dev);
diff --git a/drivers/crypto/qat/qat_c62x/adf_drv.c b/drivers/crypto/qat/qat_c62x/adf_drv.c
index 512c56509718..bc5cbc193aae 100644
--- a/drivers/crypto/qat/qat_c62x/adf_drv.c
+++ b/drivers/crypto/qat/qat_c62x/adf_drv.c
@@ -300,9 +300,7 @@ static void adf_remove(struct pci_dev *pdev)
                 pr_err("QAT: Driver removal failed\n");
                 return;
         }
-        if (adf_dev_stop(accel_dev))
-                dev_err(&GET_DEV(accel_dev), "Failed to stop QAT accel dev\n");
-
+        adf_dev_stop(accel_dev);
         adf_dev_shutdown(accel_dev);
         adf_disable_aer(accel_dev);
         adf_cleanup_accel(accel_dev);
diff --git a/drivers/crypto/qat/qat_c62xvf/adf_drv.c b/drivers/crypto/qat/qat_c62xvf/adf_drv.c
index d2e4b928f3be..ccfb25e8a4a1 100644
--- a/drivers/crypto/qat/qat_c62xvf/adf_drv.c
+++ b/drivers/crypto/qat/qat_c62xvf/adf_drv.c
@@ -270,9 +270,7 @@ static void adf_remove(struct pci_dev *pdev)
                 pr_err("QAT: Driver removal failed\n");
                 return;
         }
-        if (adf_dev_stop(accel_dev))
-                dev_err(&GET_DEV(accel_dev), "Failed to stop QAT accel dev\n");
-
+        adf_dev_stop(accel_dev);
         adf_dev_shutdown(accel_dev);
         adf_cleanup_accel(accel_dev);
         adf_cleanup_pci_dev(accel_dev);
diff --git a/drivers/crypto/qat/qat_common/adf_common_drv.h b/drivers/crypto/qat/qat_common/adf_common_drv.h
index 0e82ce3c383e..c9e4d469e930 100644
--- a/drivers/crypto/qat/qat_common/adf_common_drv.h
+++ b/drivers/crypto/qat/qat_common/adf_common_drv.h
@@ -103,7 +103,7 @@ int adf_service_unregister(struct service_hndl *service);
 
 int adf_dev_init(struct adf_accel_dev *accel_dev);
 int adf_dev_start(struct adf_accel_dev *accel_dev);
-int adf_dev_stop(struct adf_accel_dev *accel_dev);
+void adf_dev_stop(struct adf_accel_dev *accel_dev);
 void adf_dev_shutdown(struct adf_accel_dev *accel_dev);
 
 int adf_iov_putmsg(struct adf_accel_dev *accel_dev, u32 msg, u8 vf_nr);
diff --git a/drivers/crypto/qat/qat_common/adf_ctl_drv.c b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
index 740335630c57..48a1248381b3 100644
--- a/drivers/crypto/qat/qat_common/adf_ctl_drv.c
+++ b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
@@ -284,13 +284,8 @@ static int adf_ctl_stop_devices(uint32_t id)
                         if (!accel_dev->is_vf)
                                 continue;
 
-                        if (adf_dev_stop(accel_dev)) {
-                                dev_err(&GET_DEV(accel_dev),
-                                        "Failed to stop qat_dev%d\n", id);
-                                ret = -EFAULT;
-                        } else {
-                                adf_dev_shutdown(accel_dev);
-                        }
+                        adf_dev_stop(accel_dev);
+                        adf_dev_shutdown(accel_dev);
                 }
         }
 
@@ -299,13 +294,8 @@ static int adf_ctl_stop_devices(uint32_t id)
                         if (!adf_dev_started(accel_dev))
                                 continue;
 
-                        if (adf_dev_stop(accel_dev)) {
-                                dev_err(&GET_DEV(accel_dev),
-                                        "Failed to stop qat_dev%d\n", id);
-                                ret = -EFAULT;
-                        } else {
-                                adf_dev_shutdown(accel_dev);
-                        }
+                        adf_dev_stop(accel_dev);
+                        adf_dev_shutdown(accel_dev);
                 }
         }
         return ret;
diff --git a/drivers/crypto/qat/qat_common/adf_init.c b/drivers/crypto/qat/qat_common/adf_init.c
index ef5575e4a215..a29470bc8539 100644
--- a/drivers/crypto/qat/qat_common/adf_init.c
+++ b/drivers/crypto/qat/qat_common/adf_init.c
@@ -236,9 +236,9 @@ EXPORT_SYMBOL_GPL(adf_dev_start);
  * is shuting down.
  * To be used by QAT device specific drivers.
  *
- * Return: 0 on success, error code otherwise.
+ * Return: void
  */
-int adf_dev_stop(struct adf_accel_dev *accel_dev)
+void adf_dev_stop(struct adf_accel_dev *accel_dev)
 {
         struct service_hndl *service;
         struct list_head *list_itr;
@@ -246,9 +246,9 @@ int adf_dev_stop(struct adf_accel_dev *accel_dev)
         int ret;
 
         if (!adf_dev_started(accel_dev) &&
-            !test_bit(ADF_STATUS_STARTING, &accel_dev->status)) {
-                return 0;
-        }
+            !test_bit(ADF_STATUS_STARTING, &accel_dev->status))
+                return;
+
         clear_bit(ADF_STATUS_STARTING, &accel_dev->status);
         clear_bit(ADF_STATUS_STARTED, &accel_dev->status);
 
@@ -279,8 +279,6 @@ int adf_dev_stop(struct adf_accel_dev *accel_dev)
                 else
                         clear_bit(ADF_STATUS_AE_STARTED, &accel_dev->status);
         }
-
-        return 0;
 }
 EXPORT_SYMBOL_GPL(adf_dev_stop);
 
diff --git a/drivers/crypto/qat/qat_common/adf_sriov.c b/drivers/crypto/qat/qat_common/adf_sriov.c
index 1117a8b58280..4479b0b63296 100644
--- a/drivers/crypto/qat/qat_common/adf_sriov.c
+++ b/drivers/crypto/qat/qat_common/adf_sriov.c
@@ -259,13 +259,7 @@ int adf_sriov_configure(struct pci_dev *pdev, int numvfs)
                         return -EBUSY;
                 }
 
-                if (adf_dev_stop(accel_dev)) {
-                        dev_err(&GET_DEV(accel_dev),
-                                "Failed to stop qat_dev%d\n",
-                                accel_dev->accel_id);
-                        return -EFAULT;
-                }
-
+                adf_dev_stop(accel_dev);
                 adf_dev_shutdown(accel_dev);
         }
 
diff --git a/drivers/crypto/qat/qat_dh895xcc/adf_drv.c b/drivers/crypto/qat/qat_dh895xcc/adf_drv.c
index a8c4b92a7cbd..4d2de2838451 100644
--- a/drivers/crypto/qat/qat_dh895xcc/adf_drv.c
+++ b/drivers/crypto/qat/qat_dh895xcc/adf_drv.c
@@ -302,9 +302,7 @@ static void adf_remove(struct pci_dev *pdev)
                 pr_err("QAT: Driver removal failed\n");
                 return;
         }
-        if (adf_dev_stop(accel_dev))
-                dev_err(&GET_DEV(accel_dev), "Failed to stop QAT accel dev\n");
-
+        adf_dev_stop(accel_dev);
         adf_dev_shutdown(accel_dev);
         adf_disable_aer(accel_dev);
         adf_cleanup_accel(accel_dev);
diff --git a/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c b/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c
index f8cc4bf0a50c..1bf753244230 100644
--- a/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c
+++ b/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c
@@ -270,9 +270,7 @@ static void adf_remove(struct pci_dev *pdev)
                 pr_err("QAT: Driver removal failed\n");
                 return;
         }
-        if (adf_dev_stop(accel_dev))
-                dev_err(&GET_DEV(accel_dev), "Failed to stop QAT accel dev\n");
-
+        adf_dev_stop(accel_dev);
         adf_dev_shutdown(accel_dev);
         adf_cleanup_accel(accel_dev);
         adf_cleanup_pci_dev(accel_dev);