---

yaml --- r: 344271 b: refs/heads/master c: 8b5c3f6 h: refs/heads/master i: 344269: 66bedce 344267: 5fc13e2 344263: 6a8f2db 344255: 67f3fc5 v: v3
git-mirror · Nov 20, 2012 · 02ae404 · 02ae404
1 parent 2064c68
commit 02ae404
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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
@@ -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;