misc: mic/scif: use list_next_entry instead of list_entry_next

list_next_entry has been defined in list.h, so I replace list_entry_next
with it.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Reviewed-by: Sudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 11 insertions, 16 deletions

diff --git a/drivers/misc/mic/scif/scif_dma.c b/drivers/misc/mic/scif/scif_dma.c
index 95a13c629a8e..8804bccf04b6 100644
--- a/drivers/misc/mic/scif/scif_dma.c
+++ b/drivers/misc/mic/scif/scif_dma.c
@@ -74,11 +74,6 @@ struct scif_copy_work {
         bool ordered;
 };
 
-#ifndef list_entry_next
-#define list_entry_next(pos, member) \
-        list_entry(pos->member.next, typeof(*pos), member)
-#endif
-
 /**
  * scif_reserve_dma_chan:
  * @ep: Endpoint Descriptor.
@@ -851,7 +846,7 @@ static void scif_rma_local_cpu_copy(s64 offset, struct scif_window *window,
                 (window->nr_pages << PAGE_SHIFT);
         while (rem_len) {
                 if (offset == end_offset) {
-                        window = list_entry_next(window, list);
+                        window = list_next_entry(window, list);
                         end_offset = window->offset +
                                 (window->nr_pages << PAGE_SHIFT);
                 }
@@ -957,7 +952,7 @@ scif_rma_list_dma_copy_unaligned(struct scif_copy_work *work,
         remaining_len -= tail_len;
         while (remaining_len) {
                 if (offset == end_offset) {
-                        window = list_entry_next(window, list);
+                        window = list_next_entry(window, list);
                         end_offset = window->offset +
                                 (window->nr_pages << PAGE_SHIFT);
                 }
@@ -1064,7 +1059,7 @@ scif_rma_list_dma_copy_unaligned(struct scif_copy_work *work,
         }
         if (tail_len) {
                 if (offset == end_offset) {
-                        window = list_entry_next(window, list);
+                        window = list_next_entry(window, list);
                         end_offset = window->offset +
                                 (window->nr_pages << PAGE_SHIFT);
                 }
@@ -1147,13 +1142,13 @@ static int _scif_rma_list_dma_copy_aligned(struct scif_copy_work *work,
                 (dst_window->nr_pages << PAGE_SHIFT);
         while (remaining_len) {
                 if (src_offset == end_src_offset) {
-                        src_window = list_entry_next(src_window, list);
+                        src_window = list_next_entry(src_window, list);
                         end_src_offset = src_window->offset +
                                 (src_window->nr_pages << PAGE_SHIFT);
                         scif_init_window_iter(src_window, &src_win_iter);
                 }
                 if (dst_offset == end_dst_offset) {
-                        dst_window = list_entry_next(dst_window, list);
+                        dst_window = list_next_entry(dst_window, list);
                         end_dst_offset = dst_window->offset +
                                 (dst_window->nr_pages << PAGE_SHIFT);
                         scif_init_window_iter(dst_window, &dst_win_iter);
@@ -1314,13 +1309,13 @@ static int scif_rma_list_dma_copy_aligned(struct scif_copy_work *work,
         remaining_len -= tail_len;
         while (remaining_len) {
                 if (src_offset == end_src_offset) {
-                        src_window = list_entry_next(src_window, list);
+                        src_window = list_next_entry(src_window, list);
                         end_src_offset = src_window->offset +
                                 (src_window->nr_pages << PAGE_SHIFT);
                         scif_init_window_iter(src_window, &src_win_iter);
                 }
                 if (dst_offset == end_dst_offset) {
-                        dst_window = list_entry_next(dst_window, list);
+                        dst_window = list_next_entry(dst_window, list);
                         end_dst_offset = dst_window->offset +
                                 (dst_window->nr_pages << PAGE_SHIFT);
                         scif_init_window_iter(dst_window, &dst_win_iter);
@@ -1405,9 +1400,9 @@ static int scif_rma_list_dma_copy_aligned(struct scif_copy_work *work,
         if (remaining_len) {
                 loop_len = remaining_len;
                 if (src_offset == end_src_offset)
-                        src_window = list_entry_next(src_window, list);
+                        src_window = list_next_entry(src_window, list);
                 if (dst_offset == end_dst_offset)
-                        dst_window = list_entry_next(dst_window, list);
+                        dst_window = list_next_entry(dst_window, list);
 
                 src_dma_addr = __scif_off_to_dma_addr(src_window, src_offset);
                 dst_dma_addr = __scif_off_to_dma_addr(dst_window, dst_offset);
@@ -1550,12 +1545,12 @@ static int scif_rma_list_cpu_copy(struct scif_copy_work *work)
                         end_dst_offset = dst_window->offset +
                                 (dst_window->nr_pages << PAGE_SHIFT);
                         if (src_offset == end_src_offset) {
-                                src_window = list_entry_next(src_window, list);
+                                src_window = list_next_entry(src_window, list);
                                 scif_init_window_iter(src_window,
                                                       &src_win_iter);
                         }
                         if (dst_offset == end_dst_offset) {
-                                dst_window = list_entry_next(dst_window, list);
+                                dst_window = list_next_entry(dst_window, list);
                                 scif_init_window_iter(dst_window,
                                                       &dst_win_iter);
                         }