From patchwork Wed Jun 10 16:33:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 482780 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 3ECC214012C for ; Thu, 11 Jun 2015 02:35:30 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966009AbbFJQev (ORCPT ); Wed, 10 Jun 2015 12:34:51 -0400 Received: from mailrelay110.isp.belgacom.be ([195.238.20.137]:7620 "EHLO mailrelay110.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965964AbbFJQdg (ORCPT ); Wed, 10 Jun 2015 12:33:36 -0400 X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=eWtaKQUTUbzTvYESxgzcVvJXO5dQmjbJ/tTWSlQWV0k= c=1 sm=2 a=tHUMxo4TExQqjGWm9IMA:9 a=1n_xQvTtVQNBiy-J:21 a=YSAZXTcwSQaVGaDw:21 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2C5HgBcZnhV/5QztFtcgxABgTKrcwUBAQEBAQEFAYEEAZJchgmBOj0QAQEBAQEBAYEKQQOEDC8jgRo3iDIB0g+GGYowHYQXBZ8AjUaKNSRiZgFBHIFUPDGCRwEBAQ Received: from 148.51-180-91.adsl-dyn.isp.belgacom.be (HELO localhost.home.) ([91.180.51.148]) by relay.skynet.be with ESMTP; 10 Jun 2015 18:33:35 +0200 From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Julia Lawall , Fabian Frederick , Jon Mason , netdev@vger.kernel.org Subject: [PATCH 1/1 linux-next] vxge: use swap() in vxge_hw_channel_dtr_alloc() Date: Wed, 10 Jun 2015 18:33:26 +0200 Message-Id: <1433954006-24799-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 Use kernel.h macro definition. Thanks to Julia Lawall for Coccinelle scripting support. Signed-off-by: Fabian Frederick --- drivers/net/ethernet/neterion/vxge/vxge-traffic.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/ethernet/neterion/vxge/vxge-traffic.c b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c index 9e1aaa7..5f630a2 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-traffic.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c @@ -1004,8 +1004,6 @@ void vxge_hw_device_clear_tx_rx(struct __vxge_hw_device *hldev) static enum vxge_hw_status vxge_hw_channel_dtr_alloc(struct __vxge_hw_channel *channel, void **dtrh) { - void **tmp_arr; - if (channel->reserve_ptr - channel->reserve_top > 0) { _alloc_after_swap: *dtrh = channel->reserve_arr[--channel->reserve_ptr]; @@ -1020,10 +1018,7 @@ _alloc_after_swap: * i.e. no additional lock need to be done when we free a resource */ if (channel->length - channel->free_ptr > 0) { - - tmp_arr = channel->reserve_arr; - channel->reserve_arr = channel->free_arr; - channel->free_arr = tmp_arr; + swap(channel->reserve_arr, channel->free_arr); channel->reserve_ptr = channel->length; channel->reserve_top = channel->free_ptr; channel->free_ptr = channel->length;