From 02ae404f5443d475dd2cac0e44f0a3684f0dce26 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 30 Oct 2012 13:19:08 +0100 Subject: [PATCH] --- yaml --- r: 344271 b: refs/heads/master c: 8b5c3f6c8d8300e7825bb5ed6effe0bd35907751 h: refs/heads/master i: 344269: 66bedcec082308eda4700edabaff0488a3f86726 344267: 5fc13e29905a2f8e0289a784b5be746fa29d6a75 344263: 6a8f2dbc72de3cbaf26f5705b2d81922bc467bce 344255: 67f3fc53705d2c3ea3f314174429b85dfe46304d v: v3 --- [refs] | 2 +- trunk/drivers/dma/mv_xor.c | 2 -- trunk/drivers/dma/mv_xor.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5f47d6393cee..3a78366cfdf1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61971656ce72ae40939abd4b23c61976270d2374 +refs/heads/master: 8b5c3f6c8d8300e7825bb5ed6effe0bd35907751 diff --git a/trunk/drivers/dma/mv_xor.c b/trunk/drivers/dma/mv_xor.c index 49461b6e6eb4..3a54213c1b5f 100644 --- a/trunk/drivers/dma/mv_xor.c +++ b/trunk/drivers/dma/mv_xor.c @@ -1125,8 +1125,6 @@ mv_xor_channel_add(struct mv_xor_private *msp, if (!adev->dma_desc_pool_virt) return ERR_PTR(-ENOMEM); - adev->id = hw_id; - /* discover transaction capabilites from the platform data */ dma_dev->cap_mask = cap_mask; adev->pdev = pdev; diff --git a/trunk/drivers/dma/mv_xor.h b/trunk/drivers/dma/mv_xor.h index 7812565b3505..52ca6172bc6b 100644 --- a/trunk/drivers/dma/mv_xor.h +++ b/trunk/drivers/dma/mv_xor.h @@ -71,7 +71,6 @@ struct mv_xor_private { */ struct mv_xor_device { struct platform_device *pdev; - int id; dma_addr_t dma_desc_pool; void *dma_desc_pool_virt; size_t pool_size;