aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorYong Wang <yong.y.wang@intel.com>2010-10-04 06:37:27 -0400
committerDan Williams <dan.j.williams@intel.com>2010-10-07 18:03:43 -0400
commit03b96dca010145f3896abcd443b7fddb9813a0e6 (patch)
tree53fe9bffa5a23b1b4e49f953a9d8eb23f4b79935 /drivers/dma
parentb306df5e925bb584b2157f11f97c5eb20a13de4d (diff)
intel_mid_dma: Allow DMAC2 to share interrupt
Allow DMAC2 to share interrupt since exclusive interrupt line for mrst DMAC2 is not provided on other platforms. Signed-off-by: Yong Wang <yong.y.wang@intel.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/intel_mid_dma.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/dma/intel_mid_dma.c b/drivers/dma/intel_mid_dma.c
index c4b81387f0c6..3c4333ee1fb7 100644
--- a/drivers/dma/intel_mid_dma.c
+++ b/drivers/dma/intel_mid_dma.c
@@ -872,7 +872,6 @@ static int mid_setup_dma(struct pci_dev *pdev)
872{ 872{
873 struct middma_device *dma = pci_get_drvdata(pdev); 873 struct middma_device *dma = pci_get_drvdata(pdev);
874 int err, i; 874 int err, i;
875 unsigned int irq_level;
876 875
877 /* DMA coherent memory pool for DMA descriptor allocations */ 876 /* DMA coherent memory pool for DMA descriptor allocations */
878 dma->dma_pool = pci_pool_create("intel_mid_dma_desc_pool", pdev, 877 dma->dma_pool = pci_pool_create("intel_mid_dma_desc_pool", pdev,
@@ -960,7 +959,6 @@ static int mid_setup_dma(struct pci_dev *pdev)
960 959
961 /*register irq */ 960 /*register irq */
962 if (dma->pimr_mask) { 961 if (dma->pimr_mask) {
963 irq_level = IRQF_SHARED;
964 pr_debug("MDMA:Requesting irq shared for DMAC1\n"); 962 pr_debug("MDMA:Requesting irq shared for DMAC1\n");
965 err = request_irq(pdev->irq, intel_mid_dma_interrupt1, 963 err = request_irq(pdev->irq, intel_mid_dma_interrupt1,
966 IRQF_SHARED, "INTEL_MID_DMAC1", dma); 964 IRQF_SHARED, "INTEL_MID_DMAC1", dma);
@@ -968,10 +966,9 @@ static int mid_setup_dma(struct pci_dev *pdev)
968 goto err_irq; 966 goto err_irq;
969 } else { 967 } else {
970 dma->intr_mask = 0x03; 968 dma->intr_mask = 0x03;
971 irq_level = 0;
972 pr_debug("MDMA:Requesting irq for DMAC2\n"); 969 pr_debug("MDMA:Requesting irq for DMAC2\n");
973 err = request_irq(pdev->irq, intel_mid_dma_interrupt2, 970 err = request_irq(pdev->irq, intel_mid_dma_interrupt2,
974 0, "INTEL_MID_DMAC2", dma); 971 IRQF_SHARED, "INTEL_MID_DMAC2", dma);
975 if (0 != err) 972 if (0 != err)
976 goto err_irq; 973 goto err_irq;
977 } 974 }