diff options
author | Yang Hongyang <yanghy@cn.fujitsu.com> | 2009-04-06 22:01:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:31:11 -0400 |
commit | 284901a90a9e0b812ca3f5f852cbbfb60d10249d (patch) | |
tree | 06c1b5a0f83c90cfb662f756e7781977ce739ce8 /arch/mips/nxp | |
parent | 6afd142fd0dfba497246d0fab236c20a7b4bf778 (diff) |
dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)
Replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)
Signed-off-by: Yang Hongyang<yanghy@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/mips/nxp')
-rw-r--r-- | arch/mips/nxp/pnx833x/common/platform.c | 12 | ||||
-rw-r--r-- | arch/mips/nxp/pnx8550/common/platform.c | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/arch/mips/nxp/pnx833x/common/platform.c b/arch/mips/nxp/pnx833x/common/platform.c index b1ccbcc18f78..01f8345a2069 100644 --- a/arch/mips/nxp/pnx833x/common/platform.c +++ b/arch/mips/nxp/pnx833x/common/platform.c | |||
@@ -42,7 +42,7 @@ | |||
42 | #include <irq-mapping.h> | 42 | #include <irq-mapping.h> |
43 | #include <pnx833x.h> | 43 | #include <pnx833x.h> |
44 | 44 | ||
45 | static u64 uart_dmamask = DMA_32BIT_MASK; | 45 | static u64 uart_dmamask = DMA_BIT_MASK(32); |
46 | 46 | ||
47 | static struct resource pnx833x_uart_resources[] = { | 47 | static struct resource pnx833x_uart_resources[] = { |
48 | [0] = { | 48 | [0] = { |
@@ -101,14 +101,14 @@ static struct platform_device pnx833x_uart_device = { | |||
101 | .id = -1, | 101 | .id = -1, |
102 | .dev = { | 102 | .dev = { |
103 | .dma_mask = &uart_dmamask, | 103 | .dma_mask = &uart_dmamask, |
104 | .coherent_dma_mask = DMA_32BIT_MASK, | 104 | .coherent_dma_mask = DMA_BIT_MASK(32), |
105 | .platform_data = pnx8xxx_ports, | 105 | .platform_data = pnx8xxx_ports, |
106 | }, | 106 | }, |
107 | .num_resources = ARRAY_SIZE(pnx833x_uart_resources), | 107 | .num_resources = ARRAY_SIZE(pnx833x_uart_resources), |
108 | .resource = pnx833x_uart_resources, | 108 | .resource = pnx833x_uart_resources, |
109 | }; | 109 | }; |
110 | 110 | ||
111 | static u64 ehci_dmamask = DMA_32BIT_MASK; | 111 | static u64 ehci_dmamask = DMA_BIT_MASK(32); |
112 | 112 | ||
113 | static struct resource pnx833x_usb_ehci_resources[] = { | 113 | static struct resource pnx833x_usb_ehci_resources[] = { |
114 | [0] = { | 114 | [0] = { |
@@ -128,7 +128,7 @@ static struct platform_device pnx833x_usb_ehci_device = { | |||
128 | .id = -1, | 128 | .id = -1, |
129 | .dev = { | 129 | .dev = { |
130 | .dma_mask = &ehci_dmamask, | 130 | .dma_mask = &ehci_dmamask, |
131 | .coherent_dma_mask = DMA_32BIT_MASK, | 131 | .coherent_dma_mask = DMA_BIT_MASK(32), |
132 | }, | 132 | }, |
133 | .num_resources = ARRAY_SIZE(pnx833x_usb_ehci_resources), | 133 | .num_resources = ARRAY_SIZE(pnx833x_usb_ehci_resources), |
134 | .resource = pnx833x_usb_ehci_resources, | 134 | .resource = pnx833x_usb_ehci_resources, |
@@ -198,7 +198,7 @@ static struct platform_device pnx833x_i2c1_device = { | |||
198 | }; | 198 | }; |
199 | #endif | 199 | #endif |
200 | 200 | ||
201 | static u64 ethernet_dmamask = DMA_32BIT_MASK; | 201 | static u64 ethernet_dmamask = DMA_BIT_MASK(32); |
202 | 202 | ||
203 | static struct resource pnx833x_ethernet_resources[] = { | 203 | static struct resource pnx833x_ethernet_resources[] = { |
204 | [0] = { | 204 | [0] = { |
@@ -218,7 +218,7 @@ static struct platform_device pnx833x_ethernet_device = { | |||
218 | .id = -1, | 218 | .id = -1, |
219 | .dev = { | 219 | .dev = { |
220 | .dma_mask = ðernet_dmamask, | 220 | .dma_mask = ðernet_dmamask, |
221 | .coherent_dma_mask = DMA_32BIT_MASK, | 221 | .coherent_dma_mask = DMA_BIT_MASK(32), |
222 | }, | 222 | }, |
223 | .num_resources = ARRAY_SIZE(pnx833x_ethernet_resources), | 223 | .num_resources = ARRAY_SIZE(pnx833x_ethernet_resources), |
224 | .resource = pnx833x_ethernet_resources, | 224 | .resource = pnx833x_ethernet_resources, |
diff --git a/arch/mips/nxp/pnx8550/common/platform.c b/arch/mips/nxp/pnx8550/common/platform.c index 21d2955359b3..5264cc09a27b 100644 --- a/arch/mips/nxp/pnx8550/common/platform.c +++ b/arch/mips/nxp/pnx8550/common/platform.c | |||
@@ -92,16 +92,16 @@ struct pnx8xxx_port pnx8xxx_ports[] = { | |||
92 | }; | 92 | }; |
93 | 93 | ||
94 | /* The dmamask must be set for OHCI to work */ | 94 | /* The dmamask must be set for OHCI to work */ |
95 | static u64 ohci_dmamask = DMA_32BIT_MASK; | 95 | static u64 ohci_dmamask = DMA_BIT_MASK(32); |
96 | 96 | ||
97 | static u64 uart_dmamask = DMA_32BIT_MASK; | 97 | static u64 uart_dmamask = DMA_BIT_MASK(32); |
98 | 98 | ||
99 | static struct platform_device pnx8550_usb_ohci_device = { | 99 | static struct platform_device pnx8550_usb_ohci_device = { |
100 | .name = "pnx8550-ohci", | 100 | .name = "pnx8550-ohci", |
101 | .id = -1, | 101 | .id = -1, |
102 | .dev = { | 102 | .dev = { |
103 | .dma_mask = &ohci_dmamask, | 103 | .dma_mask = &ohci_dmamask, |
104 | .coherent_dma_mask = DMA_32BIT_MASK, | 104 | .coherent_dma_mask = DMA_BIT_MASK(32), |
105 | }, | 105 | }, |
106 | .num_resources = ARRAY_SIZE(pnx8550_usb_ohci_resources), | 106 | .num_resources = ARRAY_SIZE(pnx8550_usb_ohci_resources), |
107 | .resource = pnx8550_usb_ohci_resources, | 107 | .resource = pnx8550_usb_ohci_resources, |
@@ -112,7 +112,7 @@ static struct platform_device pnx8550_uart_device = { | |||
112 | .id = -1, | 112 | .id = -1, |
113 | .dev = { | 113 | .dev = { |
114 | .dma_mask = &uart_dmamask, | 114 | .dma_mask = &uart_dmamask, |
115 | .coherent_dma_mask = DMA_32BIT_MASK, | 115 | .coherent_dma_mask = DMA_BIT_MASK(32), |
116 | .platform_data = pnx8xxx_ports, | 116 | .platform_data = pnx8xxx_ports, |
117 | }, | 117 | }, |
118 | .num_resources = ARRAY_SIZE(pnx8550_uart_resources), | 118 | .num_resources = ARRAY_SIZE(pnx8550_uart_resources), |