2 files changed, 6 insertions, 6 deletions
diff --git a/arch/avr32/boards/hammerhead/flash.c b/arch/avr32/boards/hammerhead/flash.c
index 559bbcb03f9b..776c3cb9b6e4 100644
--- a/arch/avr32/boards/hammerhead/flash.c
+++ b/arch/avr32/boards/hammerhead/flash.c
@@ -280,13 +280,13 @@ static struct resource hh_fpga0_resource[] = {
        },
 };
-static u64 hh_fpga0_dma_mask = DMA_32BIT_MASK;
+static u64 hh_fpga0_dma_mask = DMA_BIT_MASK(32);
 static struct platform_device hh_fpga0_device = {
        .name           = "hh_fpga",
        .id             = 0,
        .dev            = {
                .dma_mask = &hh_fpga0_dma_mask,
-                .coherent_dma_mask = DMA_32BIT_MASK,
+                .coherent_dma_mask = DMA_BIT_MASK(32),
        },
        .resource       = hh_fpga0_resource,
        .num_resources  = ARRAY_SIZE(hh_fpga0_resource),
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index 7cc653798327..eb9d4dc2e86d 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -60,26 +60,26 @@
 * don't ... tc, smc, pio, rtc, watchdog, pwm, ps2, and more.
 */
 #define DEFINE_DEV(_name, _id)                                  \
-static u64 _name##_id##_dma_mask = DMA_32BIT_MASK;              \
+static u64 _name##_id##_dma_mask = DMA_BIT_MASK(32);            \
 static struct platform_device _name##_id##_device = {           \
        .name           = #_name,                               \
        .id             = _id,                                  \
        .dev            = {                                     \
                .dma_mask = &_name##_id##_dma_mask,             \
-                .coherent_dma_mask = DMA_32BIT_MASK,            \
+                .coherent_dma_mask = DMA_BIT_MASK(32),          \
        },                                                      \
        .resource       = _name##_id##_resource,                \
        .num_resources  = ARRAY_SIZE(_name##_id##_resource),    \
 }
 #define DEFINE_DEV_DATA(_name, _id)                             \
-static u64 _name##_id##_dma_mask = DMA_32BIT_MASK;              \
+static u64 _name##_id##_dma_mask = DMA_BIT_MASK(32);            \
 static struct platform_device _name##_id##_device = {           \
        .name           = #_name,                               \
        .id             = _id,                                  \
        .dev            = {                                     \
                .dma_mask = &_name##_id##_dma_mask,             \
                .platform_data  = &_name##_id##_data,           \
-                .coherent_dma_mask = DMA_32BIT_MASK,            \
+                .coherent_dma_mask = DMA_BIT_MASK(32),          \
        },                                                      \
        .resource       = _name##_id##_resource,                \
        .num_resources  = ARRAY_SIZE(_name##_id##_resource),    \

diff --git a/arch/avr32/boards/hammerhead/flash.c b/arch/avr32/boards/hammerhead/flash.c index 559bbcb03f9b..776c3cb9b6e4 100644 --- a/arch/avr32/boards/hammerhead/flash.c +++ b/arch/avr32/boards/hammerhead/flash.c
@@ -280,13 +280,13 @@ static struct resource hh_fpga0_resource[] = {
280	},	280	},
281	};	281	};
282		282
283	static u64 hh_fpga0_dma_mask = DMA_32BIT_MASK;	283	static u64 hh_fpga0_dma_mask = DMA_BIT_MASK(32);
284	static struct platform_device hh_fpga0_device = {	284	static struct platform_device hh_fpga0_device = {
285	.name = "hh_fpga",	285	.name = "hh_fpga",
286	.id = 0,	286	.id = 0,
287	.dev = {	287	.dev = {
288	.dma_mask = &hh_fpga0_dma_mask,	288	.dma_mask = &hh_fpga0_dma_mask,
289	.coherent_dma_mask = DMA_32BIT_MASK,	289	.coherent_dma_mask = DMA_BIT_MASK(32),
290	},	290	},
291	.resource = hh_fpga0_resource,	291	.resource = hh_fpga0_resource,
292	.num_resources = ARRAY_SIZE(hh_fpga0_resource),	292	.num_resources = ARRAY_SIZE(hh_fpga0_resource),


diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c index 7cc653798327..eb9d4dc2e86d 100644 --- a/arch/avr32/mach-at32ap/at32ap700x.c +++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -60,26 +60,26 @@
60	* don't ... tc, smc, pio, rtc, watchdog, pwm, ps2, and more.	60	* don't ... tc, smc, pio, rtc, watchdog, pwm, ps2, and more.
61	*/	61	*/
62	#define DEFINE_DEV(_name, _id) \	62	#define DEFINE_DEV(_name, _id) \
63	static u64 _name##_id##_dma_mask = DMA_32BIT_MASK; \	63	static u64 _name##_id##_dma_mask = DMA_BIT_MASK(32); \
64	static struct platform_device _name##_id##_device = { \	64	static struct platform_device _name##_id##_device = { \
65	.name = #_name, \	65	.name = #_name, \
66	.id = _id, \	66	.id = _id, \
67	.dev = { \	67	.dev = { \
68	.dma_mask = &_name##_id##_dma_mask, \	68	.dma_mask = &_name##_id##_dma_mask, \
69	.coherent_dma_mask = DMA_32BIT_MASK, \	69	.coherent_dma_mask = DMA_BIT_MASK(32), \
70	}, \	70	}, \
71	.resource = _name##_id##_resource, \	71	.resource = _name##_id##_resource, \
72	.num_resources = ARRAY_SIZE(_name##_id##_resource), \	72	.num_resources = ARRAY_SIZE(_name##_id##_resource), \
73	}	73	}
74	#define DEFINE_DEV_DATA(_name, _id) \	74	#define DEFINE_DEV_DATA(_name, _id) \
75	static u64 _name##_id##_dma_mask = DMA_32BIT_MASK; \	75	static u64 _name##_id##_dma_mask = DMA_BIT_MASK(32); \
76	static struct platform_device _name##_id##_device = { \	76	static struct platform_device _name##_id##_device = { \
77	.name = #_name, \	77	.name = #_name, \
78	.id = _id, \	78	.id = _id, \
79	.dev = { \	79	.dev = { \
80	.dma_mask = &_name##_id##_dma_mask, \	80	.dma_mask = &_name##_id##_dma_mask, \
81	.platform_data = &_name##_id##_data, \	81	.platform_data = &_name##_id##_data, \
82	.coherent_dma_mask = DMA_32BIT_MASK, \	82	.coherent_dma_mask = DMA_BIT_MASK(32), \
83	}, \	83	}, \
84	.resource = _name##_id##_resource, \	84	.resource = _name##_id##_resource, \
85	.num_resources = ARRAY_SIZE(_name##_id##_resource), \	85	.num_resources = ARRAY_SIZE(_name##_id##_resource), \