diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-10-30 06:56:26 -0400 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 09:58:57 -0500 |
commit | e39f6ec1f9c1d6a7011adf6d95d8d80bad0586b1 (patch) | |
tree | 77aeb721c8fe3c252d9d9adfaadcaae8511394b0 /arch/arm/plat-orion/common.c | |
parent | 2ccc469cfecee291707dd50e5842cbf206bc17d7 (diff) |
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.c | 28 |
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[] = { | |||
625 | }, | 625 | }, |
626 | }; | 626 | }; |
627 | 627 | ||
628 | static struct mv_xor_platform_data orion_xor0_channels_pdata[2] = { | 628 | static struct mv_xor_channel_data orion_xor0_channels_data[2] = { |
629 | { | 629 | { |
630 | .hw_id = 0, | 630 | .hw_id = 0, |
631 | .pool_size = PAGE_SIZE, | 631 | .pool_size = PAGE_SIZE, |
@@ -637,7 +637,7 @@ static struct mv_xor_platform_data orion_xor0_channels_pdata[2] = { | |||
637 | }; | 637 | }; |
638 | 638 | ||
639 | static struct mv_xor_shared_platform_data orion_xor0_pdata = { | 639 | static struct mv_xor_shared_platform_data orion_xor0_pdata = { |
640 | .channels = orion_xor0_channels_pdata, | 640 | .channels = orion_xor0_channels_data, |
641 | }; | 641 | }; |
642 | 642 | ||
643 | static struct platform_device orion_xor0_shared = { | 643 | static struct platform_device orion_xor0_shared = { |
@@ -671,12 +671,12 @@ void __init orion_xor0_init(unsigned long mapbase_low, | |||
671 | * two engines can't do memset simultaneously, this limitation | 671 | * two engines can't do memset simultaneously, this limitation |
672 | * satisfied by removing memset support from one of the engines. | 672 | * satisfied by removing memset support from one of the engines. |
673 | */ | 673 | */ |
674 | dma_cap_set(DMA_MEMCPY, orion_xor0_channels_pdata[0].cap_mask); | 674 | dma_cap_set(DMA_MEMCPY, orion_xor0_channels_data[0].cap_mask); |
675 | dma_cap_set(DMA_XOR, orion_xor0_channels_pdata[0].cap_mask); | 675 | dma_cap_set(DMA_XOR, orion_xor0_channels_data[0].cap_mask); |
676 | 676 | ||
677 | dma_cap_set(DMA_MEMSET, orion_xor0_channels_pdata[1].cap_mask); | 677 | dma_cap_set(DMA_MEMSET, orion_xor0_channels_data[1].cap_mask); |
678 | dma_cap_set(DMA_MEMCPY, orion_xor0_channels_pdata[1].cap_mask); | 678 | dma_cap_set(DMA_MEMCPY, orion_xor0_channels_data[1].cap_mask); |
679 | dma_cap_set(DMA_XOR, orion_xor0_channels_pdata[1].cap_mask); | 679 | dma_cap_set(DMA_XOR, orion_xor0_channels_data[1].cap_mask); |
680 | 680 | ||
681 | platform_device_register(&orion_xor0_shared); | 681 | platform_device_register(&orion_xor0_shared); |
682 | } | 682 | } |
@@ -700,7 +700,7 @@ static struct resource orion_xor1_shared_resources[] = { | |||
700 | }, | 700 | }, |
701 | }; | 701 | }; |
702 | 702 | ||
703 | static struct mv_xor_platform_data orion_xor1_channels_pdata[2] = { | 703 | static struct mv_xor_channel_data orion_xor1_channels_data[2] = { |
704 | { | 704 | { |
705 | .hw_id = 0, | 705 | .hw_id = 0, |
706 | .pool_size = PAGE_SIZE, | 706 | .pool_size = PAGE_SIZE, |
@@ -712,7 +712,7 @@ static struct mv_xor_platform_data orion_xor1_channels_pdata[2] = { | |||
712 | }; | 712 | }; |
713 | 713 | ||
714 | static struct mv_xor_shared_platform_data orion_xor1_pdata = { | 714 | static struct mv_xor_shared_platform_data orion_xor1_pdata = { |
715 | .channels = orion_xor1_channels_pdata, | 715 | .channels = orion_xor1_channels_data, |
716 | }; | 716 | }; |
717 | 717 | ||
718 | static struct platform_device orion_xor1_shared = { | 718 | static struct platform_device orion_xor1_shared = { |
@@ -746,12 +746,12 @@ void __init orion_xor1_init(unsigned long mapbase_low, | |||
746 | * two engines can't do memset simultaneously, this limitation | 746 | * two engines can't do memset simultaneously, this limitation |
747 | * satisfied by removing memset support from one of the engines. | 747 | * satisfied by removing memset support from one of the engines. |
748 | */ | 748 | */ |
749 | dma_cap_set(DMA_MEMCPY, orion_xor1_channels_pdata[0].cap_mask); | 749 | dma_cap_set(DMA_MEMCPY, orion_xor1_channels_data[0].cap_mask); |
750 | dma_cap_set(DMA_XOR, orion_xor1_channels_pdata[0].cap_mask); | 750 | dma_cap_set(DMA_XOR, orion_xor1_channels_data[0].cap_mask); |
751 | 751 | ||
752 | dma_cap_set(DMA_MEMSET, orion_xor1_channels_pdata[1].cap_mask); | 752 | dma_cap_set(DMA_MEMSET, orion_xor1_channels_data[1].cap_mask); |
753 | dma_cap_set(DMA_MEMCPY, orion_xor1_channels_pdata[1].cap_mask); | 753 | dma_cap_set(DMA_MEMCPY, orion_xor1_channels_data[1].cap_mask); |
754 | dma_cap_set(DMA_XOR, orion_xor1_channels_pdata[1].cap_mask); | 754 | dma_cap_set(DMA_XOR, orion_xor1_channels_data[1].cap_mask); |
755 | 755 | ||
756 | platform_device_register(&orion_xor1_shared); | 756 | platform_device_register(&orion_xor1_shared); |
757 | } | 757 | } |