diff options
-rw-r--r-- | drivers/dma/tegra20-apb-dma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c index 6ed3f43be41e..e447c8aad48a 100644 --- a/drivers/dma/tegra20-apb-dma.c +++ b/drivers/dma/tegra20-apb-dma.c | |||
@@ -169,6 +169,7 @@ typedef void (*dma_isr_handler)(struct tegra_dma_channel *tdc, | |||
169 | /* tegra_dma_channel: Channel specific information */ | 169 | /* tegra_dma_channel: Channel specific information */ |
170 | struct tegra_dma_channel { | 170 | struct tegra_dma_channel { |
171 | struct dma_chan dma_chan; | 171 | struct dma_chan dma_chan; |
172 | char name[30]; | ||
172 | bool config_init; | 173 | bool config_init; |
173 | int id; | 174 | int id; |
174 | int irq; | 175 | int irq; |
@@ -1282,7 +1283,6 @@ static int __devinit tegra_dma_probe(struct platform_device *pdev) | |||
1282 | INIT_LIST_HEAD(&tdma->dma_dev.channels); | 1283 | INIT_LIST_HEAD(&tdma->dma_dev.channels); |
1283 | for (i = 0; i < cdata->nr_channels; i++) { | 1284 | for (i = 0; i < cdata->nr_channels; i++) { |
1284 | struct tegra_dma_channel *tdc = &tdma->channels[i]; | 1285 | struct tegra_dma_channel *tdc = &tdma->channels[i]; |
1285 | char irq_name[30]; | ||
1286 | 1286 | ||
1287 | tdc->chan_base_offset = TEGRA_APBDMA_CHANNEL_BASE_ADD_OFFSET + | 1287 | tdc->chan_base_offset = TEGRA_APBDMA_CHANNEL_BASE_ADD_OFFSET + |
1288 | i * TEGRA_APBDMA_CHANNEL_REGISTER_SIZE; | 1288 | i * TEGRA_APBDMA_CHANNEL_REGISTER_SIZE; |
@@ -1294,9 +1294,9 @@ static int __devinit tegra_dma_probe(struct platform_device *pdev) | |||
1294 | goto err_irq; | 1294 | goto err_irq; |
1295 | } | 1295 | } |
1296 | tdc->irq = res->start; | 1296 | tdc->irq = res->start; |
1297 | snprintf(irq_name, sizeof(irq_name), "apbdma.%d", i); | 1297 | snprintf(tdc->name, sizeof(tdc->name), "apbdma.%d", i); |
1298 | ret = devm_request_irq(&pdev->dev, tdc->irq, | 1298 | ret = devm_request_irq(&pdev->dev, tdc->irq, |
1299 | tegra_dma_isr, 0, irq_name, tdc); | 1299 | tegra_dma_isr, 0, tdc->name, tdc); |
1300 | if (ret) { | 1300 | if (ret) { |
1301 | dev_err(&pdev->dev, | 1301 | dev_err(&pdev->dev, |
1302 | "request_irq failed with err %d channel %d\n", | 1302 | "request_irq failed with err %d channel %d\n", |