Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752835AbbKPRKp (ORCPT ); Mon, 16 Nov 2015 12:10:45 -0500 Received: from mga09.intel.com ([134.134.136.24]:3873 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751627AbbKPRKl (ORCPT ); Mon, 16 Nov 2015 12:10:41 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,303,1444719600"; d="scan'208";a="601206664" Subject: Re: [PATCH 1/3] misc: mic/scif: use list_next_entry instead of list_entry_next From: Sudeep Dutt To: Geliang Tang Cc: Sudeep Dutt , Greg Kroah-Hartman , linux-kernel@vger.kernel.org In-Reply-To: <6a47dadb3a625d7f5b20b4e98bb8af4d30db66a3.1447681244.git.geliangtang@163.com> References: <6a47dadb3a625d7f5b20b4e98bb8af4d30db66a3.1447681244.git.geliangtang@163.com> Content-Type: text/plain; charset="UTF-8" Date: Mon, 16 Nov 2015 09:08:19 -0800 Message-ID: <1447693699.93285.515.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 (2.28.3-30.el6) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4909 Lines: 123 On Mon, 2015-11-16 at 21:46 +0800, Geliang Tang wrote: > list_next_entry has been defined in list.h, so I replace list_entry_next > with it. > Thanks for the cleanup. Reviewed-by: Sudeep Dutt > Signed-off-by: Geliang Tang > --- > drivers/misc/mic/scif/scif_dma.c | 27 +++++++++++---------------- > 1 file changed, 11 insertions(+), 16 deletions(-) > > diff --git a/drivers/misc/mic/scif/scif_dma.c b/drivers/misc/mic/scif/scif_dma.c > index 95a13c6..8804bcc 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); > } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/