crypto: qat - Use list_for_each_entry() helper

Convert list_for_each() to list_for_each_entry() so that the list_itr
list_head pointer and list_entry() call are no longer needed, which
can reduce a few lines of code. No functional changed.

Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/intel/qat/qat_common/adf_init.c b/drivers/crypto/intel/qat/qat_common/adf_init.c
index 89001fe92e7629b95a92064abb1e467203bdcc63..79a81e25de9774a7b49aace5fb2d0c8ad9598239 100644 (file)
--- a/drivers/crypto/intel/qat/qat_common/adf_init.c
+++ b/drivers/crypto/intel/qat/qat_common/adf_init.c
@@ -61,7 +61,6 @@ int adf_service_unregister(struct service_hndl *service)
 static int adf_dev_init(struct adf_accel_dev *accel_dev)
 {
        struct service_hndl *service;
-       struct list_head *list_itr;
        struct adf_hw_device_data *hw_data = accel_dev->hw_device;
        int ret;
 
@@ -137,8 +136,7 @@ static int adf_dev_init(struct adf_accel_dev *accel_dev)
         * This is to facilitate any ordering dependencies between services
         * prior to starting any of the accelerators.
         */
-       list_for_each(list_itr, &service_table) {
-               service = list_entry(list_itr, struct service_hndl, list);
+       list_for_each_entry(service, &service_table, list) {
                if (service->event_hld(accel_dev, ADF_EVENT_INIT)) {
                        dev_err(&GET_DEV(accel_dev),
                                "Failed to initialise service %s\n",
@@ -165,7 +163,6 @@ static int adf_dev_start(struct adf_accel_dev *accel_dev)
 {
        struct adf_hw_device_data *hw_data = accel_dev->hw_device;
        struct service_hndl *service;
-       struct list_head *list_itr;
        int ret;
 
        set_bit(ADF_STATUS_STARTING, &accel_dev->status);
@@ -209,8 +206,7 @@ static int adf_dev_start(struct adf_accel_dev *accel_dev)
 
        adf_heartbeat_start(accel_dev);
 
-       list_for_each(list_itr, &service_table) {
-               service = list_entry(list_itr, struct service_hndl, list);
+       list_for_each_entry(service, &service_table, list) {
                if (service->event_hld(accel_dev, ADF_EVENT_START)) {
                        dev_err(&GET_DEV(accel_dev),
                                "Failed to start service %s\n",
@@ -259,7 +255,6 @@ static void adf_dev_stop(struct adf_accel_dev *accel_dev)
 {
        struct adf_hw_device_data *hw_data = accel_dev->hw_device;
        struct service_hndl *service;
-       struct list_head *list_itr;
        bool wait = false;
        int ret;
 
@@ -280,8 +275,7 @@ static void adf_dev_stop(struct adf_accel_dev *accel_dev)
        if (!list_empty(&accel_dev->compression_list))
                qat_comp_algs_unregister();
 
-       list_for_each(list_itr, &service_table) {
-               service = list_entry(list_itr, struct service_hndl, list);
+       list_for_each_entry(service, &service_table, list) {
                if (!test_bit(accel_dev->accel_id, service->start_status))
                        continue;
                ret = service->event_hld(accel_dev, ADF_EVENT_STOP);
@@ -318,7 +312,6 @@ static void adf_dev_shutdown(struct adf_accel_dev *accel_dev)
 {
        struct adf_hw_device_data *hw_data = accel_dev->hw_device;
        struct service_hndl *service;
-       struct list_head *list_itr;
 
        if (!hw_data) {
                dev_err(&GET_DEV(accel_dev),
@@ -340,8 +333,7 @@ static void adf_dev_shutdown(struct adf_accel_dev *accel_dev)
                                  &accel_dev->status);
        }
 
-       list_for_each(list_itr, &service_table) {
-               service = list_entry(list_itr, struct service_hndl, list);
+       list_for_each_entry(service, &service_table, list) {
                if (!test_bit(accel_dev->accel_id, service->init_status))
                        continue;
                if (service->event_hld(accel_dev, ADF_EVENT_SHUTDOWN))
@@ -378,10 +370,8 @@ static void adf_dev_shutdown(struct adf_accel_dev *accel_dev)
 int adf_dev_restarting_notify(struct adf_accel_dev *accel_dev)
 {
        struct service_hndl *service;
-       struct list_head *list_itr;
 
-       list_for_each(list_itr, &service_table) {
-               service = list_entry(list_itr, struct service_hndl, list);
+       list_for_each_entry(service, &service_table, list) {
                if (service->event_hld(accel_dev, ADF_EVENT_RESTARTING))
                        dev_err(&GET_DEV(accel_dev),
                                "Failed to restart service %s.\n",
@@ -393,10 +383,8 @@ int adf_dev_restarting_notify(struct adf_accel_dev *accel_dev)
 int adf_dev_restarted_notify(struct adf_accel_dev *accel_dev)
 {
        struct service_hndl *service;
-       struct list_head *list_itr;
 
-       list_for_each(list_itr, &service_table) {
-               service = list_entry(list_itr, struct service_hndl, list);
+       list_for_each_entry(service, &service_table, list) {
                if (service->event_hld(accel_dev, ADF_EVENT_RESTARTED))
                        dev_err(&GET_DEV(accel_dev),
                                "Failed to restart service %s.\n",