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

Commit 14f3c36b authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

ARM: iop: don't use using 64-bit DMA masks 



[ Upstream commit 2125801ccce19249708ca3245d48998e70569ab8 ]

clang warns about statically defined DMA masks from the DMA_BIT_MASK
macro with length 64:

 arch/arm/mach-iop13xx/setup.c:303:35: error: shift count >= width of type [-Werror,-Wshift-count-overflow]
 static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(64);
                                  ^~~~~~~~~~~~~~~~
 include/linux/dma-mapping.h:141:54: note: expanded from macro 'DMA_BIT_MASK'
 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
                                                      ^ ~~~

The ones in iop shouldn't really be 64 bit masks, so changing them
to what the driver can support avoids the warning.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 39839f3e

arch/arm/mach-iop13xx/setup.c

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

};



static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(64);

static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(32);

static struct iop_adma_platform_data iop13xx_adma_0_data = {

	.hw_id = 0,

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

	.dev = {

		.dma_mask = &iop13xx_adma_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = (void *) &iop13xx_adma_0_data,

	},

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

	.dev = {

		.dma_mask = &iop13xx_adma_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = (void *) &iop13xx_adma_1_data,

	},

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

	.dev = {

		.dma_mask = &iop13xx_adma_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = (void *) &iop13xx_adma_2_data,

	},

};

arch/arm/mach-iop13xx/tpmi.c

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

};



u64 iop13xx_tpmi_mask = DMA_BIT_MASK(64);

u64 iop13xx_tpmi_mask = DMA_BIT_MASK(32);

static struct platform_device iop13xx_tpmi_0_device = {

	.name = "iop-tpmi",

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

	.dev = {

		.dma_mask          = &iop13xx_tpmi_mask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

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

	.dev = {

		.dma_mask          = &iop13xx_tpmi_mask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

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

	.dev = {

		.dma_mask          = &iop13xx_tpmi_mask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

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

	.dev = {

		.dma_mask          = &iop13xx_tpmi_mask,

		.coherent_dma_mask = DMA_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

};

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_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.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_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.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_BIT_MASK(64),

		.coherent_dma_mask = DMA_BIT_MASK(32),

		.platform_data = (void *) &iop3xx_aau_data,

	},

};