Skip to content

Commit

Permalink
dma: mv_xor: rename mv_xor_platform_data to mv_xor_channel_data
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Thomas Petazzoni committed Nov 20, 2012
1 parent 2ccc469 commit e39f6ec
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
28 changes: 14 additions & 14 deletions arch/arm/plat-orion/common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 = {
Expand Down Expand Up @@ -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);
}
Expand All @@ -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,
Expand All @@ -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 = {
Expand Down Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/dma/mv_xor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1300,7 +1300,7 @@ static int mv_xor_shared_probe(struct platform_device *pdev)

if (pdata && pdata->channels) {
for (i = 0; i < MV_XOR_MAX_CHANNELS; i++) {
struct mv_xor_platform_data *cd;
struct mv_xor_channel_data *cd;
int irq;

cd = &pdata->channels[i];
Expand Down
4 changes: 2 additions & 2 deletions include/linux/platform_data/dma-mv_xor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@

#define MV_XOR_SHARED_NAME "mv_xor_shared"

struct mv_xor_platform_data {
struct mv_xor_channel_data {
int hw_id;
dma_cap_mask_t cap_mask;
size_t pool_size;
};

struct mv_xor_shared_platform_data {
struct mv_xor_platform_data *channels;
struct mv_xor_channel_data *channels;
};

#endif

0 comments on commit e39f6ec

Please sign in to comment.