dma: ipu: remove the use of ipu_platform_data

The struct ipu_platform_data is used by platform code to pass
MXC_IPU_IRQ_START to ipu-core driver.  We can save it by having
ipu-core driver call irq_alloc_descs to get the irq_base.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Dong Aisheng <dong.aisheng@linaro.org>

2 files changed, 12 insertions, 10 deletions

diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c
index 5ec72044ea4..c7573e50aa1 100644
--- a/drivers/dma/ipu/ipu_idmac.c
+++ b/drivers/dma/ipu/ipu_idmac.c
@@ -1663,7 +1663,6 @@ static void __exit ipu_idmac_exit(struct ipu *ipu)
 
 static int __init ipu_probe(struct platform_device *pdev)
 {
-        struct ipu_platform_data *pdata = pdev->dev.platform_data;
         struct resource *mem_ipu, *mem_ic;
         int ret;
 
@@ -1671,7 +1670,7 @@ static int __init ipu_probe(struct platform_device *pdev)
 
         mem_ipu = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         mem_ic  = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-        if (!pdata || !mem_ipu || !mem_ic)
+        if (!mem_ipu || !mem_ic)
                 return -EINVAL;
 
         ipu_data.dev = &pdev->dev;
@@ -1688,10 +1687,9 @@ static int __init ipu_probe(struct platform_device *pdev)
                 goto err_noirq;
 
         ipu_data.irq_err = ret;
-        ipu_data.irq_base = pdata->irq_base;
 
-        dev_dbg(&pdev->dev, "fn irq %u, err irq %u, irq-base %u\n",
-                ipu_data.irq_fn, ipu_data.irq_err, ipu_data.irq_base);
+        dev_dbg(&pdev->dev, "fn irq %u, err irq %u\n",
+                ipu_data.irq_fn, ipu_data.irq_err);
 
         /* Remap IPU common registers */
         ipu_data.reg_ipu = ioremap(mem_ipu->start, resource_size(mem_ipu));
diff --git a/drivers/dma/ipu/ipu_irq.c b/drivers/dma/ipu/ipu_irq.c
index a71f55e72be..fa95bcc3de1 100644
--- a/drivers/dma/ipu/ipu_irq.c
+++ b/drivers/dma/ipu/ipu_irq.c
@@ -14,6 +14,7 @@
 #include <linux/clk.h>
 #include <linux/irq.h>
 #include <linux/io.h>
+#include <linux/module.h>
 
 #include <mach/ipu.h>
 
@@ -354,10 +355,12 @@ static struct irq_chip ipu_irq_chip = {
 /* Install the IRQ handler */
 int __init ipu_irq_attach_irq(struct ipu *ipu, struct platform_device *dev)
 {
-        struct ipu_platform_data *pdata = dev->dev.platform_data;
-        unsigned int irq, irq_base, i;
+        unsigned int irq, i;
+        int irq_base = irq_alloc_descs(-1, 0, CONFIG_MX3_IPU_IRQS,
+                                       numa_node_id());
 
-        irq_base = pdata->irq_base;
+        if (irq_base < 0)
+                return irq_base;
 
         for (i = 0; i < IPU_IRQ_NR_BANKS; i++)
                 irq_bank[i].ipu = ipu;
@@ -387,15 +390,16 @@ int __init ipu_irq_attach_irq(struct ipu *ipu, struct platform_device *dev)
         irq_set_handler_data(ipu->irq_err, ipu);
         irq_set_chained_handler(ipu->irq_err, ipu_irq_err);
 
+        ipu->irq_base = irq_base;
+
         return 0;
 }
 
 void ipu_irq_detach_irq(struct ipu *ipu, struct platform_device *dev)
 {
-        struct ipu_platform_data *pdata = dev->dev.platform_data;
         unsigned int irq, irq_base;
 
-        irq_base = pdata->irq_base;
+        irq_base = ipu->irq_base;
 
         irq_set_chained_handler(ipu->irq_fn, NULL);
         irq_set_handler_data(ipu->irq_fn, NULL);