aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/plat-orion/common.c
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-10-30 11:56:26 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-11-20 15:58:57 +0100
commite39f6ec1f9c1d6a7011adf6d95d8d80bad0586b1 (patch)
tree77aeb721c8fe3c252d9d9adfaadcaae8511394b0 /arch/arm/plat-orion/common.c
parent2ccc469cfecee291707dd50e5842cbf206bc17d7 (diff)
downloadlinux-linaro-stable-e39f6ec1f9c1d6a7011adf6d95d8d80bad0586b1.tar.gz
dma: mv_xor: rename mv_xor_platform_data to mv_xor_channel_data
mv_xor_platform_data used to be the platform_data structure associated to the 'mv_xor' driver. This driver no longer exists, and this data structure really contains the properties of each XOR channel part of a given XOR engine. Therefore 'struct mv_xor_channel_data' is a more appropriate name. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'arch/arm/plat-orion/common.c')
-rw-r--r--arch/arm/plat-orion/common.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index 5a66211d523c..7ffbe77c52cb 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -625,7 +625,7 @@ static struct resource orion_xor0_shared_resources[] = {
},
};
-static struct mv_xor_platform_data orion_xor0_channels_pdata[2] = {
+static struct mv_xor_channel_data orion_xor0_channels_data[2] = {
{
.hw_id = 0,
.pool_size = PAGE_SIZE,
@@ -637,7 +637,7 @@ static struct mv_xor_platform_data orion_xor0_channels_pdata[2] = {
};
static struct mv_xor_shared_platform_data orion_xor0_pdata = {
- .channels = orion_xor0_channels_pdata,
+ .channels = orion_xor0_channels_data,
};
static struct platform_device orion_xor0_shared = {
@@ -671,12 +671,12 @@ void __init orion_xor0_init(unsigned long mapbase_low,
* two engines can't do memset simultaneously, this limitation
* satisfied by removing memset support from one of the engines.
*/
- dma_cap_set(DMA_MEMCPY, orion_xor0_channels_pdata[0].cap_mask);
- dma_cap_set(DMA_XOR, orion_xor0_channels_pdata[0].cap_mask);
+ dma_cap_set(DMA_MEMCPY, orion_xor0_channels_data[0].cap_mask);
+ dma_cap_set(DMA_XOR, orion_xor0_channels_data[0].cap_mask);
- dma_cap_set(DMA_MEMSET, orion_xor0_channels_pdata[1].cap_mask);
- dma_cap_set(DMA_MEMCPY, orion_xor0_channels_pdata[1].cap_mask);
- dma_cap_set(DMA_XOR, orion_xor0_channels_pdata[1].cap_mask);
+ dma_cap_set(DMA_MEMSET, orion_xor0_channels_data[1].cap_mask);
+ dma_cap_set(DMA_MEMCPY, orion_xor0_channels_data[1].cap_mask);
+ dma_cap_set(DMA_XOR, orion_xor0_channels_data[1].cap_mask);
platform_device_register(&orion_xor0_shared);
}
@@ -700,7 +700,7 @@ static struct resource orion_xor1_shared_resources[] = {
},
};
-static struct mv_xor_platform_data orion_xor1_channels_pdata[2] = {
+static struct mv_xor_channel_data orion_xor1_channels_data[2] = {
{
.hw_id = 0,
.pool_size = PAGE_SIZE,
@@ -712,7 +712,7 @@ static struct mv_xor_platform_data orion_xor1_channels_pdata[2] = {
};
static struct mv_xor_shared_platform_data orion_xor1_pdata = {
- .channels = orion_xor1_channels_pdata,
+ .channels = orion_xor1_channels_data,
};
static struct platform_device orion_xor1_shared = {
@@ -746,12 +746,12 @@ void __init orion_xor1_init(unsigned long mapbase_low,
* two engines can't do memset simultaneously, this limitation
* satisfied by removing memset support from one of the engines.
*/
- dma_cap_set(DMA_MEMCPY, orion_xor1_channels_pdata[0].cap_mask);
- dma_cap_set(DMA_XOR, orion_xor1_channels_pdata[0].cap_mask);
+ dma_cap_set(DMA_MEMCPY, orion_xor1_channels_data[0].cap_mask);
+ dma_cap_set(DMA_XOR, orion_xor1_channels_data[0].cap_mask);
- dma_cap_set(DMA_MEMSET, orion_xor1_channels_pdata[1].cap_mask);
- dma_cap_set(DMA_MEMCPY, orion_xor1_channels_pdata[1].cap_mask);
- dma_cap_set(DMA_XOR, orion_xor1_channels_pdata[1].cap_mask);
+ dma_cap_set(DMA_MEMSET, orion_xor1_channels_data[1].cap_mask);
+ dma_cap_set(DMA_MEMCPY, orion_xor1_channels_data[1].cap_mask);
+ dma_cap_set(DMA_XOR, orion_xor1_channels_data[1].cap_mask);
platform_device_register(&orion_xor1_shared);
}