aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/ipu/ipu_idmac.c8
-rw-r--r--drivers/dma/ipu/ipu_irq.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c
index a6f7294c8598..b759ae9315ba 100644
--- a/drivers/dma/ipu/ipu_idmac.c
+++ b/drivers/dma/ipu/ipu_idmac.c
@@ -1576,7 +1576,7 @@ static int __init ipu_idmac_init(struct ipu *ipu)
1576 return dma_async_device_register(&idmac->dma); 1576 return dma_async_device_register(&idmac->dma);
1577} 1577}
1578 1578
1579static void ipu_idmac_exit(struct ipu *ipu) 1579static void __exit ipu_idmac_exit(struct ipu *ipu)
1580{ 1580{
1581 int i; 1581 int i;
1582 struct idmac *idmac = &ipu->idmac; 1582 struct idmac *idmac = &ipu->idmac;
@@ -1595,7 +1595,7 @@ static void ipu_idmac_exit(struct ipu *ipu)
1595 * IPU common probe / remove 1595 * IPU common probe / remove
1596 */ 1596 */
1597 1597
1598static int ipu_probe(struct platform_device *pdev) 1598static int __init ipu_probe(struct platform_device *pdev)
1599{ 1599{
1600 struct ipu_platform_data *pdata = pdev->dev.platform_data; 1600 struct ipu_platform_data *pdata = pdev->dev.platform_data;
1601 struct resource *mem_ipu, *mem_ic; 1601 struct resource *mem_ipu, *mem_ic;
@@ -1695,7 +1695,7 @@ err_noirq:
1695 return ret; 1695 return ret;
1696} 1696}
1697 1697
1698static int ipu_remove(struct platform_device *pdev) 1698static int __exit ipu_remove(struct platform_device *pdev)
1699{ 1699{
1700 struct ipu *ipu = platform_get_drvdata(pdev); 1700 struct ipu *ipu = platform_get_drvdata(pdev);
1701 1701
@@ -1720,7 +1720,7 @@ static struct platform_driver ipu_platform_driver = {
1720 .name = "ipu-core", 1720 .name = "ipu-core",
1721 .owner = THIS_MODULE, 1721 .owner = THIS_MODULE,
1722 }, 1722 },
1723 .remove = ipu_remove, 1723 .remove = __exit_p(ipu_remove),
1724}; 1724};
1725 1725
1726static int __init ipu_init(void) 1726static int __init ipu_init(void)
diff --git a/drivers/dma/ipu/ipu_irq.c b/drivers/dma/ipu/ipu_irq.c
index 83f532cc767f..dd8ebc75b667 100644
--- a/drivers/dma/ipu/ipu_irq.c
+++ b/drivers/dma/ipu/ipu_irq.c
@@ -352,7 +352,7 @@ static struct irq_chip ipu_irq_chip = {
352}; 352};
353 353
354/* Install the IRQ handler */ 354/* Install the IRQ handler */
355int ipu_irq_attach_irq(struct ipu *ipu, struct platform_device *dev) 355int __init ipu_irq_attach_irq(struct ipu *ipu, struct platform_device *dev)
356{ 356{
357 struct ipu_platform_data *pdata = dev->dev.platform_data; 357 struct ipu_platform_data *pdata = dev->dev.platform_data;
358 unsigned int irq, irq_base, i; 358 unsigned int irq, irq_base, i;