From 6d79f5a196b981a299a4641679fd4b113ae159c5 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 31 Oct 2012 13:24:41 +0100 Subject: [PATCH] --- yaml --- r: 344266 b: refs/heads/master c: 2ccc469cfecee291707dd50e5842cbf206bc17d7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-orion/common.c | 8 -------- trunk/include/linux/platform_data/dma-mv_xor.h | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index f9fe4b9f1ffc..3d1710992911 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18b2a02c7c8db8bb87a165d26c269968d3dd47bd +refs/heads/master: 2ccc469cfecee291707dd50e5842cbf206bc17d7 diff --git a/trunk/arch/arm/plat-orion/common.c b/trunk/arch/arm/plat-orion/common.c index c6e6666986ff..5a66211d523c 100644 --- a/trunk/arch/arm/plat-orion/common.c +++ b/trunk/arch/arm/plat-orion/common.c @@ -625,16 +625,12 @@ static struct resource orion_xor0_shared_resources[] = { }, }; -static struct platform_device orion_xor0_shared; - static struct mv_xor_platform_data orion_xor0_channels_pdata[2] = { { - .shared = &orion_xor0_shared, .hw_id = 0, .pool_size = PAGE_SIZE, }, { - .shared = &orion_xor0_shared, .hw_id = 1, .pool_size = PAGE_SIZE, }, @@ -704,16 +700,12 @@ static struct resource orion_xor1_shared_resources[] = { }, }; -static struct platform_device orion_xor1_shared; - static struct mv_xor_platform_data orion_xor1_channels_pdata[2] = { { - .shared = &orion_xor1_shared, .hw_id = 0, .pool_size = PAGE_SIZE, }, { - .shared = &orion_xor1_shared, .hw_id = 1, .pool_size = PAGE_SIZE, }, diff --git a/trunk/include/linux/platform_data/dma-mv_xor.h b/trunk/include/linux/platform_data/dma-mv_xor.h index 6abe5f9326b6..4a0980b14c9b 100644 --- a/trunk/include/linux/platform_data/dma-mv_xor.h +++ b/trunk/include/linux/platform_data/dma-mv_xor.h @@ -13,7 +13,6 @@ #define MV_XOR_SHARED_NAME "mv_xor_shared" struct mv_xor_platform_data { - struct platform_device *shared; int hw_id; dma_cap_mask_t cap_mask; size_t pool_size;