From patchwork Thu Feb 19 06:44:00 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Hongyang X-Patchwork-Id: 23405 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 9932DDDEE2 for ; Thu, 19 Feb 2009 17:42:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752799AbZBSGmf (ORCPT ); Thu, 19 Feb 2009 01:42:35 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752653AbZBSGme (ORCPT ); Thu, 19 Feb 2009 01:42:34 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:53958 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752630AbZBSGme (ORCPT ); Thu, 19 Feb 2009 01:42:34 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 077AE1700BD; Thu, 19 Feb 2009 14:50:15 +0800 (CST) Received: from fnst.cn.fujitsu.com (localhost.localdomain [127.0.0.1]) by tang.cn.fujitsu.com (8.13.1/8.13.1) with ESMTP id n1J6gWMr012145; Thu, 19 Feb 2009 14:42:32 +0800 Received: from localhost.localdomain (unknown [10.167.141.200]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 6881FD44CD; Thu, 19 Feb 2009 14:42:01 +0800 (CST) Message-ID: <499CFFB0.6060206@cn.fujitsu.com> Date: Thu, 19 Feb 2009 14:44:00 +0800 From: Yang Hongyang User-Agent: Thunderbird 2.0.0.17 (X11/20081009) MIME-Version: 1.0 To: Andrew Morton , "David S. Miller" CC: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Borislav Petkov Subject: [PATCH 04/12]Replace all DMA_39BIT_MASK micro with DMA_BIT_MASK(39) References: <499CFDC8.1070600@cn.fujitsu.com> In-Reply-To: <499CFDC8.1070600@cn.fujitsu.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Replace all DMA_39BIT_MASK micro with DMA_BIT_MASK(39) Signed-off-by: Yang Hongyang --- drivers/net/forcedeth.c | 4 ++-- drivers/net/netxen/netxen_nic_main.c | 8 ++++---- drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 5b910cf..069d87d 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c @@ -5534,12 +5534,12 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i np->desc_ver = DESC_VER_3; np->txrxctl_bits = NVREG_TXRXCTL_DESC_3; if (dma_64bit) { - if (pci_set_dma_mask(pci_dev, DMA_39BIT_MASK)) + if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(39))) dev_printk(KERN_INFO, &pci_dev->dev, "64-bit DMA failed, using 32-bit addressing\n"); else dev->features |= NETIF_F_HIGHDMA; - if (pci_set_consistent_dma_mask(pci_dev, DMA_39BIT_MASK)) { + if (pci_set_consistent_dma_mask(pci_dev, DMA_BIT_MASK(39))) { dev_printk(KERN_INFO, &pci_dev->dev, "64-bit DMA (consistent) failed, using 32-bit ring buffers\n"); } diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 285e725..8bea4cb 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -177,11 +177,11 @@ static int nx_set_dma_mask(struct netxen_adapter *adapter, uint8_t revision_id) #else if (revision_id >= NX_P3_B0) { /* should go to DMA_BIT_MASK(64) */ - adapter->dma_mask = DMA_39BIT_MASK; - mask = DMA_39BIT_MASK; + adapter->dma_mask = DMA_BIT_MASK(39); + mask = DMA_BIT_MASK(39); } else if (revision_id == NX_P3_A2) { - adapter->dma_mask = DMA_39BIT_MASK; - mask = DMA_39BIT_MASK; + adapter->dma_mask = DMA_BIT_MASK(39); + mask = DMA_BIT_MASK(39); } else if (revision_id == NX_P2_C1) { adapter->dma_mask = DMA_35BIT_MASK; mask = DMA_35BIT_MASK; diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c index 032e2b1..c583d89 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c +++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c @@ -194,11 +194,11 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (sizeof(dma_addr_t) > 4) { const u64 required_mask = dma_get_required_mask(dev); - if (required_mask > DMA_39BIT_MASK && + if (required_mask > DMA_BIT_MASK(39) && dma_set_mask(dev, DMA_BIT_MASK(64)) == 0) ahd->flags |= AHD_64BIT_ADDRESSING; else if (required_mask > DMA_32BIT_MASK && - dma_set_mask(dev, DMA_39BIT_MASK) == 0) + dma_set_mask(dev, DMA_BIT_MASK(39)) == 0) ahd->flags |= AHD_39BIT_ADDRESSING; else dma_set_mask(dev, DMA_32BIT_MASK);