diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-10-30 06:58:14 -0400 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 09:58:57 -0500 |
commit | 7dde453d628687c0e991cfc55c9fd299a804aee6 (patch) | |
tree | 81c51af3ad070c422883c84e764261ffe2b09246 | |
parent | e39f6ec1f9c1d6a7011adf6d95d8d80bad0586b1 (diff) |
dma: mv_xor: rename mv_xor_shared_platform_data to mv_xor_platform_data
'struct mv_xor_shared_platform_data' used to be the platform_data
structure for the 'mv_xor_shared', but this driver is going to be
renamed simply 'mv_xor', so also rename its platform_data structure
accordingly.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r-- | arch/arm/plat-orion/common.c | 4 | ||||
-rw-r--r-- | drivers/dma/mv_xor.c | 2 | ||||
-rw-r--r-- | include/linux/platform_data/dma-mv_xor.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c index 7ffbe77c52c..edd57a68fa8 100644 --- a/arch/arm/plat-orion/common.c +++ b/arch/arm/plat-orion/common.c | |||
@@ -636,7 +636,7 @@ static struct mv_xor_channel_data orion_xor0_channels_data[2] = { | |||
636 | }, | 636 | }, |
637 | }; | 637 | }; |
638 | 638 | ||
639 | static struct mv_xor_shared_platform_data orion_xor0_pdata = { | 639 | static struct mv_xor_platform_data orion_xor0_pdata = { |
640 | .channels = orion_xor0_channels_data, | 640 | .channels = orion_xor0_channels_data, |
641 | }; | 641 | }; |
642 | 642 | ||
@@ -711,7 +711,7 @@ static struct mv_xor_channel_data orion_xor1_channels_data[2] = { | |||
711 | }, | 711 | }, |
712 | }; | 712 | }; |
713 | 713 | ||
714 | static struct mv_xor_shared_platform_data orion_xor1_pdata = { | 714 | static struct mv_xor_platform_data orion_xor1_pdata = { |
715 | .channels = orion_xor1_channels_data, | 715 | .channels = orion_xor1_channels_data, |
716 | }; | 716 | }; |
717 | 717 | ||
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index c7926e41728..ac598168b21 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c | |||
@@ -1254,7 +1254,7 @@ static int mv_xor_shared_probe(struct platform_device *pdev) | |||
1254 | { | 1254 | { |
1255 | const struct mbus_dram_target_info *dram; | 1255 | const struct mbus_dram_target_info *dram; |
1256 | struct mv_xor_shared_private *msp; | 1256 | struct mv_xor_shared_private *msp; |
1257 | struct mv_xor_shared_platform_data *pdata = pdev->dev.platform_data; | 1257 | struct mv_xor_platform_data *pdata = pdev->dev.platform_data; |
1258 | struct resource *res; | 1258 | struct resource *res; |
1259 | int i, ret; | 1259 | int i, ret; |
1260 | 1260 | ||
diff --git a/include/linux/platform_data/dma-mv_xor.h b/include/linux/platform_data/dma-mv_xor.h index 40ea3d5f5b9..82a5f4b84af 100644 --- a/include/linux/platform_data/dma-mv_xor.h +++ b/include/linux/platform_data/dma-mv_xor.h | |||
@@ -18,7 +18,7 @@ struct mv_xor_channel_data { | |||
18 | size_t pool_size; | 18 | size_t pool_size; |
19 | }; | 19 | }; |
20 | 20 | ||
21 | struct mv_xor_shared_platform_data { | 21 | struct mv_xor_platform_data { |
22 | struct mv_xor_channel_data *channels; | 22 | struct mv_xor_channel_data *channels; |
23 | }; | 23 | }; |
24 | 24 | ||