From patchwork Sun May 10 07:04:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 27034 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 3095FB6F56 for ; Sun, 10 May 2009 17:06:07 +1000 (EST) Received: by ozlabs.org (Postfix) id 21A9EDDDA5; Sun, 10 May 2009 17:06:07 +1000 (EST) 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 AC983DDDA2 for ; Sun, 10 May 2009 17:06:06 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752560AbZEJHF7 (ORCPT ); Sun, 10 May 2009 03:05:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751510AbZEJHF6 (ORCPT ); Sun, 10 May 2009 03:05:58 -0400 Received: from smtp.wellnetcz.com ([212.24.148.102]:36945 "EHLO smtp.wellnetcz.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751297AbZEJHF6 (ORCPT ); Sun, 10 May 2009 03:05:58 -0400 Received: from localhost.localdomain ([88.208.94.142]) by smtp.wellnetcz.com (8.14.1/8.14.1) with ESMTP id n4A7dxp1014228; Sun, 10 May 2009 09:39:59 +0200 From: Jiri Slaby To: mingo@elte.hu Cc: yanghy@cn.fujitsu.com, akpm@linux-foundation.org, fujita.tomonori@lab.ntt.co.jp, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Slaby Subject: [PATCH 1/1] dma-mapping: mark DMA_nBITS_MASK as deprecated fix Date: Sun, 10 May 2009 09:04:26 +0200 Message-Id: <1241939066-10178-1-git-send-email-jirislaby@gmail.com> X-Mailer: git-send-email 1.6.2.4 In-Reply-To: <20090510085618D.fujita.tomonori@lab.ntt.co.jp> References: <20090510085618D.fujita.tomonori@lab.ntt.co.jp> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Andrew, please fold into dma-mapping: mark DMA_nBITS_MASK as deprecated Acked-by: FUJITA Tomonori --- As Fujita correctly demurs, use more meaningful typedef name, so that we now see: warning: DMA_nnBIT_MASK is deprecated instead of warning: DMA_DEPRECATED is deprecated Signed-off-by: Jiri Slaby Cc: Yang Hongyang Cc: FUJITA Tomonori Cc: Ingo Molnar --- include/linux/dma-mapping.h | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 6bf3339..38f5608 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -63,7 +63,7 @@ struct dma_map_ops { #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) -typedef u64 DMA_DEPRECATED __deprecated; +typedef u64 DMA_nnBIT_MASK __deprecated; /* * NOTE: do not use the below macros in new code and do not add new definitions @@ -71,18 +71,18 @@ typedef u64 DMA_DEPRECATED __deprecated; * * Instead, just open-code DMA_BIT_MASK(n) within your driver */ -#define DMA_64BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(64) -#define DMA_48BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(48) -#define DMA_47BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(47) -#define DMA_40BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(40) -#define DMA_39BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(39) -#define DMA_35BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(35) -#define DMA_32BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(32) -#define DMA_31BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(31) -#define DMA_30BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(30) -#define DMA_29BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(29) -#define DMA_28BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(28) -#define DMA_24BIT_MASK (DMA_DEPRECATED)DMA_BIT_MASK(24) +#define DMA_64BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(64) +#define DMA_48BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(48) +#define DMA_47BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(47) +#define DMA_40BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(40) +#define DMA_39BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(39) +#define DMA_35BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(35) +#define DMA_32BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(32) +#define DMA_31BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(31) +#define DMA_30BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(30) +#define DMA_29BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(29) +#define DMA_28BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(28) +#define DMA_24BIT_MASK (DMA_nnBIT_MASK)DMA_BIT_MASK(24) #define DMA_MASK_NONE 0x0ULL