From patchwork Mon Jun 15 17:13:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 484442 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 893EE1401AD for ; Tue, 16 Jun 2015 03:13:31 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754589AbbFORNN (ORCPT ); Mon, 15 Jun 2015 13:13:13 -0400 Received: from mailrelay107.isp.belgacom.be ([195.238.20.134]:2306 "EHLO mailrelay107.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750734AbbFORNL (ORCPT ); Mon, 15 Jun 2015 13:13:11 -0400 X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=LOuw2EFi1HDSQg+ei2vZVMH4RVJmMX849kfT6mZcEoQ= c=1 sm=2 a=qKiJYYR9tJ2MM_rMf0cA:9 a=IcuOCB-Ax7rO-4wc:21 a=PeKHLO2y9-qrI3ew:21 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2DeBgBDBn9V/wwntFtbgxCBM6tWBQGBBJhpgT1NAQEBAQEBgQuEfyOBGjeIMwHLNCyGGoowHYQXBZNbi0KNVYo7JmNmAUEcgVQ8MYJHAQEB Received: from 12.39-180-91.adsl-dyn.isp.belgacom.be (HELO localhost.home.) ([91.180.39.12]) by relay.skynet.be with ESMTP; 15 Jun 2015 19:13:10 +0200 From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Fabian Frederick , Chien Yen , "David S. Miller" , rds-devel@oss.oracle.com, netdev@vger.kernel.org Subject: [PATCH 1/1 net-next] net: rds: use for_each_sg() for scatterlist parsing Date: Mon, 15 Jun 2015 19:13:05 +0200 Message-Id: <1434388385-29246-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 2.4.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch also renames sg to sglist and aligns function parameters. See Documentation/DMA-API.txt - Part Id for scatterlist details Signed-off-by: Fabian Frederick --- This is untested. net/rds/ib.h | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/net/rds/ib.h b/net/rds/ib.h index c36d713..01d8072 100644 --- a/net/rds/ib.h +++ b/net/rds/ib.h @@ -235,28 +235,34 @@ extern struct workqueue_struct *rds_ib_wq; * doesn't define it. */ static inline void rds_ib_dma_sync_sg_for_cpu(struct ib_device *dev, - struct scatterlist *sg, unsigned int sg_dma_len, int direction) + struct scatterlist *sglist, + unsigned int sg_dma_len, + int direction) { unsigned int i; + struct scatterlist *sg; - for (i = 0; i < sg_dma_len; ++i) { + for_each_sg(sglist, sg, sg_dma_len, i) { ib_dma_sync_single_for_cpu(dev, - ib_sg_dma_address(dev, &sg[i]), - ib_sg_dma_len(dev, &sg[i]), + ib_sg_dma_address(dev, sg), + ib_sg_dma_len(dev, sg), direction); } } #define ib_dma_sync_sg_for_cpu rds_ib_dma_sync_sg_for_cpu static inline void rds_ib_dma_sync_sg_for_device(struct ib_device *dev, - struct scatterlist *sg, unsigned int sg_dma_len, int direction) + struct scatterlist *sglist, + unsigned int sg_dma_len, + int direction) { unsigned int i; + struct scatterlist *sg; - for (i = 0; i < sg_dma_len; ++i) { + for_each_sg(sglist, sg, sg_dma_len, i) { ib_dma_sync_single_for_device(dev, - ib_sg_dma_address(dev, &sg[i]), - ib_sg_dma_len(dev, &sg[i]), + ib_sg_dma_address(dev, sg), + ib_sg_dma_len(dev, sg), direction); } }