From patchwork Sat Apr 22 01:21:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 753651 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 3w8vwF4x7Mz9s2s for ; Sat, 22 Apr 2017 11:22:05 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MZN3Nuna"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1042986AbdDVBVp (ORCPT ); Fri, 21 Apr 2017 21:21:45 -0400 Received: from mail-it0-f68.google.com ([209.85.214.68]:36168 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1042972AbdDVBVj (ORCPT ); Fri, 21 Apr 2017 21:21:39 -0400 Received: by mail-it0-f68.google.com with SMTP id x188so623430itb.3; Fri, 21 Apr 2017 18:21:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+tVmjKAOS77XbScUpwr5ktXf1Yql90ctsqH8IHyu8dU=; b=MZN3NunakPou45UVz7JNJIL7ikYwswoi+smRWYzjMsqFBo6DJ+7OQ/6/qr1SkhCcHU yLqAwCuwzgGYZC+ziLgFwTfdQ+zUnLRsuSSUQegWbSRR7Apy6MtCK/KOdbCcPWeicqKc 9gNmqjmnWZxBxWCVA/pHs5KOWJjsH3CJuJ6DtYGPG4BJ9QLYVvZkqeOj32k+kolukoc+ QS1MtxwFyD1caGhB3n02vqiOSkO2JsB7ZrSFnQxUb1K6vVxzkN20snWPx7akgDhozymO wMybuwShw4ao9CYTwKMH0BCjzvYlnkbrM9OwHv259DxwGkMDD/CNOeY1yGQXJBw6sDnE sVgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+tVmjKAOS77XbScUpwr5ktXf1Yql90ctsqH8IHyu8dU=; b=G8IYGeT02AjU2OhTWsi2gvndwV2fjDHR+IwqRAgNaueIKlncValTHmavrSXWF0rOMj ZckBmLHL2FSMqyRbJ9U+Lf9K4RV0C1CwsxMlKGrn6v3Gq3yYGCylDI06WhnpWarkK2q8 c3Rj251x1MdcmwksrUfJxnX3Sog7OimMnBpqKzlQCnQTRPldz+T8oDLBt+7WwX2984Jd 8TPhRIHCmzvQyHN3dlFF3y8M7TfhJ7BfoPGYJWGbA8G1YPIIzyeJdVzlXnYjMEYJ1JK4 SWzS4uy2JXZMcDyf9jAI88RXPkUkzCZTvHqMUpnp8J1gvvymGlVRvRcgWOtuTyhQWisK rfkQ== X-Gm-Message-State: AN3rC/6Jt9Ccbg8tWOWfH1WbGiwM0rW6gxHWWBuY4GcD1V3IYVVGsMMW apw+XBatPUBqkw== X-Received: by 10.99.128.200 with SMTP id j191mr14585312pgd.28.1492824098451; Fri, 21 Apr 2017 18:21:38 -0700 (PDT) Received: from localhost ([162.211.125.117]) by smtp.gmail.com with ESMTPSA id d82sm18049977pfl.124.2017.04.21.18.21.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 21 Apr 2017 18:21:38 -0700 (PDT) From: Geliang Tang To: Jay Cliburn , Chris Snook , "David S. Miller" , Eric Dumazet Cc: Geliang Tang , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: atheros: atl1: use offset_in_page() macro Date: Sat, 22 Apr 2017 09:21:10 +0800 Message-Id: X-Mailer: git-send-email 2.9.3 In-Reply-To: <4dbc77ccaaed98b183cf4dba58a4fa325fd65048.1492758503.git.geliangtang@gmail.com> References: <4dbc77ccaaed98b183cf4dba58a4fa325fd65048.1492758503.git.geliangtang@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use offset_in_page() macro instead of open-coding. Signed-off-by: Geliang Tang --- drivers/net/ethernet/atheros/atlx/atl1.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c index 022772e..83d2db2 100644 --- a/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/drivers/net/ethernet/atheros/atlx/atl1.c @@ -1886,7 +1886,7 @@ static u16 atl1_alloc_rx_buffers(struct atl1_adapter *adapter) buffer_info->skb = skb; buffer_info->length = (u16) adapter->rx_buffer_len; page = virt_to_page(skb->data); - offset = (unsigned long)skb->data & ~PAGE_MASK; + offset = offset_in_page(skb->data); buffer_info->dma = pci_map_page(pdev, page, offset, adapter->rx_buffer_len, PCI_DMA_FROMDEVICE); @@ -2230,7 +2230,7 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb, hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb); buffer_info->length = hdr_len; page = virt_to_page(skb->data); - offset = (unsigned long)skb->data & ~PAGE_MASK; + offset = offset_in_page(skb->data); buffer_info->dma = pci_map_page(adapter->pdev, page, offset, hdr_len, PCI_DMA_TODEVICE); @@ -2254,9 +2254,8 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb, data_len -= buffer_info->length; page = virt_to_page(skb->data + (hdr_len + i * ATL1_MAX_TX_BUF_LEN)); - offset = (unsigned long)(skb->data + - (hdr_len + i * ATL1_MAX_TX_BUF_LEN)) & - ~PAGE_MASK; + offset = offset_in_page(skb->data + + (hdr_len + i * ATL1_MAX_TX_BUF_LEN)); buffer_info->dma = pci_map_page(adapter->pdev, page, offset, buffer_info->length, PCI_DMA_TODEVICE); @@ -2268,7 +2267,7 @@ static void atl1_tx_map(struct atl1_adapter *adapter, struct sk_buff *skb, /* not TSO */ buffer_info->length = buf_len; page = virt_to_page(skb->data); - offset = (unsigned long)skb->data & ~PAGE_MASK; + offset = offset_in_page(skb->data); buffer_info->dma = pci_map_page(adapter->pdev, page, offset, buf_len, PCI_DMA_TODEVICE); if (++next_to_use == tpd_ring->count)