Skip to contentSkip to conversation

dma: remove DMA_xxBIT_MASK macros

PATCH In review Américo Wang 4 participants 4 messages Jun 16, 2011 – Jun 24, 2011

Subsystems (2)
Documentation DMA mapping helpers
lore
Share & tools
lore

Américo Wang

author
#0 lore raw

PATCH 1/1 dma: remove DMA_xxBIT_MASK macros

git grep shows there are no users in tree, so we can remove them safely.

Signed-off-by WANG Cong <[email protected]>
Cc FUJITA Tomonori <[email protected]>
---
 Documentation/feature-removal-schedule.txt |    7 -------
 include/linux/dma-mapping.h                |   21 ---------------------
 2 files changed, 0 insertions(+), 28 deletions(-)
Documentation/feature-removal-schedule.txt +0 -7
index 72e2384..8e2d816 100644
@@ -474,13 +474,6 @@ Who:	FUJITA Tomonori <[email protected]>
 
 ----------------------------
 
-What: 	DMA_xxBIT_MASK macros
-When:	Jun 2011
-Why:	DMA_xxBIT_MASK macros were replaced with DMA_BIT_MASK() macros.
-Who:	FUJITA Tomonori <[email protected]>
-
-----------------------------
-
 What:	iwlwifi disable_hw_scan module parameters
 When:	2.6.40
 Why:	Hareware scan is the prefer method for iwlwifi devices for
include/linux/dma-mapping.h +0 -21
index ba8319a..dc77808 100644
@@ -54,27 +54,6 @@ struct dma_map_ops {
 
 #define DMA_BIT_MASK(n)	(((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
 
-typedef u64 DMA_nnBIT_MASK __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_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
 
 static inline int valid_dma_direction(int dma_direction)
Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · On Thu, 16 Jun 2011 17:00:37 +0800 **UNKNOWN CHARSET** Wang…

git grep shows there are no users in tree, so we can remove them safely.

Signed-off-by WANG Cong <[email protected]>
Cc FUJITA Tomonori <[email protected]>
---
 Documentation/feature-removal-schedule.txt |    7 -------
 include/linux/dma-mapping.h                |   21 ---------------------
 2 files changed, 0 insertions(+), 28 deletions(-)
Acked-by FUJITA Tomonori <[email protected]>

Andrew, can you merge this via the -mm tree?

Thanks,

Acked-by on v1 1/1
#2 lore raw
In reply to Américo Wang
Quoted 6 lines · Américo Wang

git grep shows there are no users in tree, so we can remove them safely.

Signed-off-by WANG Cong <[email protected]>
Cc FUJITA Tomonori <[email protected]>

Oh, my __deprecated hack goes away. Nice :).

Acked-by Jiri Slaby <[email protected]>
Quoted 61 lines
---
 Documentation/feature-removal-schedule.txt |    7 -------
 include/linux/dma-mapping.h                |   21 ---------------------
 2 files changed, 0 insertions(+), 28 deletions(-)
Documentation/feature-removal-schedule.txt +0 -7
index 72e2384..8e2d816 100644
@@ -474,13 +474,6 @@ Who:	FUJITA Tomonori <[email protected]>
 
 ----------------------------
 
-What: 	DMA_xxBIT_MASK macros
-When:	Jun 2011
-Why:	DMA_xxBIT_MASK macros were replaced with DMA_BIT_MASK() macros.
-Who:	FUJITA Tomonori <[email protected]>
-
-----------------------------
-
 What:	iwlwifi disable_hw_scan module parameters
 When:	2.6.40
 Why:	Hareware scan is the prefer method for iwlwifi devices for
include/linux/dma-mapping.h +0 -22
index ba8319a..dc77808 100644
@@ -54,27 +54,6 @@ struct dma_map_ops {
 
 #define DMA_BIT_MASK(n)	(((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
 
-typedef u64 DMA_nnBIT_MASK __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_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
 
 static inline int valid_dma_direction(int dma_direction)
--

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Signature · 2 lines
js
suse labs
Acked-by
#3 lore raw
Quoted 11 lines · Jiri Slaby
Quoted 6 lines · Américo Wang

git grep shows there are no users in tree, so we can remove them safely.

Signed-off-by WANG Cong <[email protected]>
Cc FUJITA Tomonori <[email protected]>

Oh, my __deprecated hack goes away. Nice :).

Acked-by Jiri Slaby <[email protected]>
Acked-by Vinod Koul <[email protected]>
Quoted 64 lines
Quoted 62 lines
---
 Documentation/feature-removal-schedule.txt |    7 -------
 include/linux/dma-mapping.h                |   21 ---------------------
 2 files changed, 0 insertions(+), 28 deletions(-)
Documentation/feature-removal-schedule.txt +0 -7
index 72e2384..8e2d816 100644
@@ -474,13 +474,6 @@ Who:	FUJITA Tomonori <[email protected]>
 
 ----------------------------
 
-What: 	DMA_xxBIT_MASK macros
-When:	Jun 2011
-Why:	DMA_xxBIT_MASK macros were replaced with DMA_BIT_MASK() macros.
-Who:	FUJITA Tomonori <[email protected]>
-
-----------------------------
-
 What:	iwlwifi disable_hw_scan module parameters
 When:	2.6.40
 Why:	Hareware scan is the prefer method for iwlwifi devices for
include/linux/dma-mapping.h +0 -22
index ba8319a..dc77808 100644
@@ -54,27 +54,6 @@ struct dma_map_ops {
 
 #define DMA_BIT_MASK(n)	(((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
 
-typedef u64 DMA_nnBIT_MASK __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_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
 
 static inline int valid_dma_direction(int dma_direction)
--

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Signature · 1 line
~Vinod