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

Commit 6a35528a authored by Yang Hongyang's avatar Yang Hongyang Committed by Linus Torvalds
Browse files

dma-mapping: replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64) 



Replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64)

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 8a59f5d2

arch/arm/mach-iop13xx/setup.c

+4 −4
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static struct resource iop13xx_adma_2_resources[] = { 
	}

};



static u64 iop13xx_adma_dmamask = DMA_64BIT_MASK;

static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(64);

static struct iop_adma_platform_data iop13xx_adma_0_data = {

	.hw_id = 0,

	.pool_size = PAGE_SIZE,
@@ -331,7 +331,7 @@ static struct platform_device iop13xx_adma_0_channel = { 
	.resource = iop13xx_adma_0_resources,

	.dev = {

		.dma_mask = &iop13xx_adma_dmamask,

		.coherent_dma_mask = DMA_64BIT_MASK,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.platform_data = (void *) &iop13xx_adma_0_data,

	},

};
@@ -343,7 +343,7 @@ static struct platform_device iop13xx_adma_1_channel = { 
	.resource = iop13xx_adma_1_resources,

	.dev = {

		.dma_mask = &iop13xx_adma_dmamask,

		.coherent_dma_mask = DMA_64BIT_MASK,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.platform_data = (void *) &iop13xx_adma_1_data,

	},

};
@@ -355,7 +355,7 @@ static struct platform_device iop13xx_adma_2_channel = { 
	.resource = iop13xx_adma_2_resources,

	.dev = {

		.dma_mask = &iop13xx_adma_dmamask,

		.coherent_dma_mask = DMA_64BIT_MASK,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.platform_data = (void *) &iop13xx_adma_2_data,

	},

};

arch/arm/mach-iop13xx/tpmi.c

+5 −5
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static struct resource iop13xx_tpmi_3_resources[] = { 
	}

};



u64 iop13xx_tpmi_mask = DMA_64BIT_MASK;

u64 iop13xx_tpmi_mask = DMA_BIT_MASK(64);

static struct platform_device iop13xx_tpmi_0_device = {

	.name = "iop-tpmi",

	.id = 0,
@@ -159,7 +159,7 @@ static struct platform_device iop13xx_tpmi_0_device = { 
	.resource = iop13xx_tpmi_0_resources,

	.dev = {

		.dma_mask          = &iop13xx_tpmi_mask,

		.coherent_dma_mask = DMA_64BIT_MASK,

		.coherent_dma_mask = DMA_BIT_MASK(64),

	},

};
@@ -170,7 +170,7 @@ static struct platform_device iop13xx_tpmi_1_device = { 
	.resource = iop13xx_tpmi_1_resources,

	.dev = {

		.dma_mask          = &iop13xx_tpmi_mask,

		.coherent_dma_mask = DMA_64BIT_MASK,

		.coherent_dma_mask = DMA_BIT_MASK(64),

	},

};
@@ -181,7 +181,7 @@ static struct platform_device iop13xx_tpmi_2_device = { 
	.resource = iop13xx_tpmi_2_resources,

	.dev = {

		.dma_mask          = &iop13xx_tpmi_mask,

		.coherent_dma_mask = DMA_64BIT_MASK,

		.coherent_dma_mask = DMA_BIT_MASK(64),

	},

};
@@ -192,7 +192,7 @@ static struct platform_device iop13xx_tpmi_3_device = { 
	.resource = iop13xx_tpmi_3_resources,

	.dev = {

		.dma_mask          = &iop13xx_tpmi_mask,

		.coherent_dma_mask = DMA_64BIT_MASK,

		.coherent_dma_mask = DMA_BIT_MASK(64),

	},

};

arch/arm/mach-kirkwood/common.c

+4 −4
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ static struct platform_device kirkwood_xor00_channel = { 
	.resource	= kirkwood_xor00_resources,

	.dev		= {

		.dma_mask		= &kirkwood_xor_dmamask,

		.coherent_dma_mask	= DMA_64BIT_MASK,

		.coherent_dma_mask	= DMA_BIT_MASK(64),

		.platform_data		= (void *)&kirkwood_xor00_data,

	},

};
@@ -585,7 +585,7 @@ static struct platform_device kirkwood_xor01_channel = { 
	.resource	= kirkwood_xor01_resources,

	.dev		= {

		.dma_mask		= &kirkwood_xor_dmamask,

		.coherent_dma_mask	= DMA_64BIT_MASK,

		.coherent_dma_mask	= DMA_BIT_MASK(64),

		.platform_data		= (void *)&kirkwood_xor01_data,

	},

};
@@ -657,7 +657,7 @@ static struct platform_device kirkwood_xor10_channel = { 
	.resource	= kirkwood_xor10_resources,

	.dev		= {

		.dma_mask		= &kirkwood_xor_dmamask,

		.coherent_dma_mask	= DMA_64BIT_MASK,

		.coherent_dma_mask	= DMA_BIT_MASK(64),

		.platform_data		= (void *)&kirkwood_xor10_data,

	},

};
@@ -683,7 +683,7 @@ static struct platform_device kirkwood_xor11_channel = { 
	.resource	= kirkwood_xor11_resources,

	.dev		= {

		.dma_mask		= &kirkwood_xor_dmamask,

		.coherent_dma_mask	= DMA_64BIT_MASK,

		.coherent_dma_mask	= DMA_BIT_MASK(64),

		.platform_data		= (void *)&kirkwood_xor11_data,

	},

};

arch/arm/mach-orion5x/common.c

+2 −2
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ static struct platform_device orion5x_xor0_channel = { 
	.resource	= orion5x_xor0_resources,

	.dev		= {

		.dma_mask		= &orion5x_xor_dmamask,

		.coherent_dma_mask	= DMA_64BIT_MASK,

		.coherent_dma_mask	= DMA_BIT_MASK(64),

		.platform_data		= (void *)&orion5x_xor0_data,

	},

};
@@ -512,7 +512,7 @@ static struct platform_device orion5x_xor1_channel = { 
	.resource	= orion5x_xor1_resources,

	.dev		= {

		.dma_mask		= &orion5x_xor_dmamask,

		.coherent_dma_mask	= DMA_64BIT_MASK,

		.coherent_dma_mask	= DMA_BIT_MASK(64),

		.platform_data		= (void *)&orion5x_xor1_data,

	},

};

arch/arm/plat-iop/adma.c

+3 −3
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ struct platform_device iop3xx_dma_0_channel = { 
	.resource = iop3xx_dma_0_resources,

	.dev = {

		.dma_mask = &iop3xx_adma_dmamask,

		.coherent_dma_mask = DMA_64BIT_MASK,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.platform_data = (void *) &iop3xx_dma_0_data,

	},

};
@@ -155,7 +155,7 @@ struct platform_device iop3xx_dma_1_channel = { 
	.resource = iop3xx_dma_1_resources,

	.dev = {

		.dma_mask = &iop3xx_adma_dmamask,

		.coherent_dma_mask = DMA_64BIT_MASK,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.platform_data = (void *) &iop3xx_dma_1_data,

	},

};
@@ -167,7 +167,7 @@ struct platform_device iop3xx_aau_channel = { 
	.resource = iop3xx_aau_resources,

	.dev = {

		.dma_mask = &iop3xx_adma_dmamask,

		.coherent_dma_mask = DMA_64BIT_MASK,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.platform_data = (void *) &iop3xx_aau_data,

	},

};