From patchwork Thu Feb 19 06:54:25 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Hongyang X-Patchwork-Id: 23412 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 62FB1DDE1D for ; Thu, 19 Feb 2009 17:53:05 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754073AbZBSGxA (ORCPT ); Thu, 19 Feb 2009 01:53:00 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752950AbZBSGw7 (ORCPT ); Thu, 19 Feb 2009 01:52:59 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:54346 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751659AbZBSGw6 (ORCPT ); Thu, 19 Feb 2009 01:52:58 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 4444E17013F; Thu, 19 Feb 2009 15:00:40 +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 n1J6qvQc012866; Thu, 19 Feb 2009 14:52:57 +0800 Received: from localhost.localdomain (unknown [10.167.141.200]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id D8B14D44D3; Thu, 19 Feb 2009 14:52:25 +0800 (CST) Message-ID: <499D0221.9090407@cn.fujitsu.com> Date: Thu, 19 Feb 2009 14:54:25 +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 11/12]Remove defines of DMA_XXBIT_MASK micro 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 Remove defines of DMA_XXBIT_MASK micro Signed-off-by: Yang Hongyang --- include/linux/dma-mapping.h | 20 +------------------- 1 files changed, 1 insertions(+), 19 deletions(-) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index f238c7e..70f9c63 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -13,27 +13,9 @@ enum dma_data_direction { DMA_NONE = 3, }; +/*use DMA_BIT_MASK(n) within your driver instead of DMA_xxBIT_MASK*/ #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) -/* - * NOTE: do not use the below macros in new code and do not add new definitions - * here. - * - * Instead, just open-code DMA_BIT_MASK(n) within your driver - */ -#define DMA_64BIT_MASK DMA_BIT_MASK(64) -#define DMA_48BIT_MASK DMA_BIT_MASK(48) -#define DMA_47BIT_MASK DMA_BIT_MASK(47) -#define DMA_40BIT_MASK DMA_BIT_MASK(40) -#define DMA_39BIT_MASK DMA_BIT_MASK(39) -#define DMA_35BIT_MASK DMA_BIT_MASK(35) -#define DMA_32BIT_MASK DMA_BIT_MASK(32) -#define DMA_31BIT_MASK DMA_BIT_MASK(31) -#define DMA_30BIT_MASK DMA_BIT_MASK(30) -#define DMA_29BIT_MASK DMA_BIT_MASK(29) -#define DMA_28BIT_MASK DMA_BIT_MASK(28) -#define DMA_24BIT_MASK DMA_BIT_MASK(24) - #define DMA_MASK_NONE 0x0ULL static inline int valid_dma_direction(int dma_direction)