From patchwork Fri May 8 08:00:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 26991 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 2FE44B7043 for ; Fri, 8 May 2009 18:02:17 +1000 (EST) Received: by ozlabs.org (Postfix) id 233ABDDE06; Fri, 8 May 2009 18:02:17 +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 BF586DDDF0 for ; Fri, 8 May 2009 18:02:16 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754092AbZEHICI (ORCPT ); Fri, 8 May 2009 04:02:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753435AbZEHICI (ORCPT ); Fri, 8 May 2009 04:02:08 -0400 Received: from smtp.wellnetcz.com ([212.24.148.102]:36920 "EHLO smtp.wellnetcz.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751036AbZEHICG (ORCPT ); Fri, 8 May 2009 04:02:06 -0400 Received: from localhost.localdomain ([88.208.94.142]) by smtp.wellnetcz.com (8.14.1/8.14.1) with ESMTP id n488Zi3M008184; Fri, 8 May 2009 10:35:44 +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: mark DMA_nBITS_MASK as deprecated Date: Fri, 8 May 2009 10:00:38 +0200 Message-Id: <1241769638-27301-1-git-send-email-jirislaby@gmail.com> X-Mailer: git-send-email 1.6.2.4 In-Reply-To: <20090507111846.GI28398@elte.hu> References: <20090507111846.GI28398@elte.hu> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Ingo Molnar wrote: > Can you see a way to emit build warnings? If yes then that might be > a better solution instead of breaking in-the-pipeline code. What about this: Acked-by: FUJITA Tomonori --- Mark them deprecated so that 3rd party vendors get notified about that before their modules break by removing those macros later. Signed-off-by: Jiri Slaby --- include/linux/dma-mapping.h | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 8083b6a..6bf3339 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -63,24 +63,26 @@ struct dma_map_ops { #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) +typedef u64 DMA_DEPRECATED __deprecated; + /* * 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_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_MASK_NONE 0x0ULL