Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 284901a9 authored by Yang Hongyang's avatar Yang Hongyang Committed by Linus Torvalds
Browse files

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: default avatarYang <Hongyang&lt;yanghy@cn.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6afd142f

arch/arm/mach-davinci/board-evm.c

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static struct resource ide_resources[] = { 
	},

};



static u64 ide_dma_mask = DMA_32BIT_MASK;

static u64 ide_dma_mask = DMA_BIT_MASK(32);



static struct platform_device ide_dev = {

	.name           = "palm_bk3710",
@@ -127,7 +127,7 @@ static struct platform_device ide_dev = { 
	.num_resources  = ARRAY_SIZE(ide_resources),

	.dev = {

		.dma_mask		= &ide_dma_mask,

		.coherent_dma_mask      = DMA_32BIT_MASK,

		.coherent_dma_mask      = DMA_BIT_MASK(32),

	},

};

arch/arm/mach-davinci/usb.c

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static struct resource usb_resources[] = { 
	},

};



static u64 usb_dmamask = DMA_32BIT_MASK;

static u64 usb_dmamask = DMA_BIT_MASK(32);



static struct platform_device usb_dev = {

	.name           = "musb_hdrc",
@@ -72,7 +72,7 @@ static struct platform_device usb_dev = { 
	.dev = {

		.platform_data		= &usb_data,

		.dma_mask		= &usb_dmamask,

		.coherent_dma_mask      = DMA_32BIT_MASK,

		.coherent_dma_mask      = DMA_BIT_MASK(32),

	},

	.resource       = usb_resources,

	.num_resources  = ARRAY_SIZE(usb_resources),

arch/arm/mach-kirkwood/common.c

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static struct mv_xor_platform_shared_data kirkwood_xor_shared_data = { 
	.dram		= &kirkwood_mbus_dram_info,

};



static u64 kirkwood_xor_dmamask = DMA_32BIT_MASK;

static u64 kirkwood_xor_dmamask = DMA_BIT_MASK(32);





/*****************************************************************************

arch/arm/mach-orion5x/common.c

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ static struct platform_device orion5x_xor_shared = { 
	.resource	= orion5x_xor_shared_resources,

};



static u64 orion5x_xor_dmamask = DMA_32BIT_MASK;

static u64 orion5x_xor_dmamask = DMA_BIT_MASK(32);



static struct resource orion5x_xor0_resources[] = {

	[0] = {

arch/arm/plat-iop/adma.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static struct resource iop3xx_aau_resources[] = { 
	}

};



static u64 iop3xx_adma_dmamask = DMA_32BIT_MASK;

static u64 iop3xx_adma_dmamask = DMA_BIT_MASK(32);



static struct iop_adma_platform_data iop3xx_dma_0_data = {

	.hw_id = DMA0_ID,