aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-11-15 09:36:37 -0500
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-11-20 09:59:00 -0500
commit9aedbdbab39c8aa58c0b2a0791fb10df6eebc123 (patch)
treead8a80c2cdfbc891203dcbccd529e1be08fbbbae /drivers/dma
parentc819ce177eb4dc796996618c1d53856cad1201ec (diff)
dma: mv_xor: remove hw_id field from platform_data
There is no need for the platform_data to give this ID, it is simply the channel number, so we can compute it inside the driver when registering the channels. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/mv_xor.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index a6a5a28574c4..fc983bf38438 100644
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -1088,7 +1088,7 @@ static int mv_xor_channel_remove(struct mv_xor_chan *mv_chan)
1088static struct mv_xor_chan * 1088static struct mv_xor_chan *
1089mv_xor_channel_add(struct mv_xor_device *xordev, 1089mv_xor_channel_add(struct mv_xor_device *xordev,
1090 struct platform_device *pdev, 1090 struct platform_device *pdev,
1091 int hw_id, dma_cap_mask_t cap_mask, 1091 int idx, dma_cap_mask_t cap_mask,
1092 size_t pool_size, int irq) 1092 size_t pool_size, int irq)
1093{ 1093{
1094 int ret = 0; 1094 int ret = 0;
@@ -1101,7 +1101,7 @@ mv_xor_channel_add(struct mv_xor_device *xordev,
1101 goto err_free_dma; 1101 goto err_free_dma;
1102 } 1102 }
1103 1103
1104 mv_chan->idx = hw_id; 1104 mv_chan->idx = idx;
1105 1105
1106 dma_dev = &mv_chan->dmadev; 1106 dma_dev = &mv_chan->dmadev;
1107 1107
@@ -1295,7 +1295,7 @@ static int mv_xor_probe(struct platform_device *pdev)
1295 } 1295 }
1296 1296
1297 xordev->channels[i] = 1297 xordev->channels[i] =
1298 mv_xor_channel_add(xordev, pdev, cd->hw_id, 1298 mv_xor_channel_add(xordev, pdev, i,
1299 cd->cap_mask, 1299 cd->cap_mask,
1300 cd->pool_size, irq); 1300 cd->pool_size, irq);
1301 if (IS_ERR(xordev->channels[i])) { 1301 if (IS_ERR(xordev->channels[i])) {