diff options
author | Maxin B. John <maxin.john@enea.com> | 2013-02-19 19:07:04 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2013-04-15 00:21:16 -0400 |
commit | 1d1bbd305a7831c47a35811e3ee7e8a6a7c7ed3a (patch) | |
tree | f7f8ac9a4ef2c64fde6522bbe058f14fe981923e | |
parent | 234846d4c8342a5adeb9f70fc0bca606e32c8d2e (diff) |
dma: Remove erroneous __exit and __exit_p() references
Removing the annotation with __exit and referencing with __exit_p()
present in dma driver module remove hooks.
Part of the __devexit and __devexit_p() purge.
Signed-off-by: Maxin B. John <maxin.john@enea.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r-- | drivers/dma/at_hdmac.c | 4 | ||||
-rw-r--r-- | drivers/dma/coh901318.c | 4 | ||||
-rw-r--r-- | drivers/dma/imx-dma.c | 4 | ||||
-rw-r--r-- | drivers/dma/imx-sdma.c | 4 | ||||
-rw-r--r-- | drivers/dma/ipu/ipu_idmac.c | 4 | ||||
-rw-r--r-- | drivers/dma/txx9dmac.c | 8 |
6 files changed, 14 insertions, 14 deletions
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c index 6e13f262139a..841546776159 100644 --- a/drivers/dma/at_hdmac.c +++ b/drivers/dma/at_hdmac.c | |||
@@ -1407,7 +1407,7 @@ err_kfree: | |||
1407 | return err; | 1407 | return err; |
1408 | } | 1408 | } |
1409 | 1409 | ||
1410 | static int __exit at_dma_remove(struct platform_device *pdev) | 1410 | static int at_dma_remove(struct platform_device *pdev) |
1411 | { | 1411 | { |
1412 | struct at_dma *atdma = platform_get_drvdata(pdev); | 1412 | struct at_dma *atdma = platform_get_drvdata(pdev); |
1413 | struct dma_chan *chan, *_chan; | 1413 | struct dma_chan *chan, *_chan; |
@@ -1565,7 +1565,7 @@ static const struct dev_pm_ops at_dma_dev_pm_ops = { | |||
1565 | }; | 1565 | }; |
1566 | 1566 | ||
1567 | static struct platform_driver at_dma_driver = { | 1567 | static struct platform_driver at_dma_driver = { |
1568 | .remove = __exit_p(at_dma_remove), | 1568 | .remove = at_dma_remove, |
1569 | .shutdown = at_dma_shutdown, | 1569 | .shutdown = at_dma_shutdown, |
1570 | .id_table = atdma_devtypes, | 1570 | .id_table = atdma_devtypes, |
1571 | .driver = { | 1571 | .driver = { |
diff --git a/drivers/dma/coh901318.c b/drivers/dma/coh901318.c index 797940e532ff..3b23061cdb41 100644 --- a/drivers/dma/coh901318.c +++ b/drivers/dma/coh901318.c | |||
@@ -2748,7 +2748,7 @@ static int __init coh901318_probe(struct platform_device *pdev) | |||
2748 | return err; | 2748 | return err; |
2749 | } | 2749 | } |
2750 | 2750 | ||
2751 | static int __exit coh901318_remove(struct platform_device *pdev) | 2751 | static int coh901318_remove(struct platform_device *pdev) |
2752 | { | 2752 | { |
2753 | struct coh901318_base *base = platform_get_drvdata(pdev); | 2753 | struct coh901318_base *base = platform_get_drvdata(pdev); |
2754 | 2754 | ||
@@ -2760,7 +2760,7 @@ static int __exit coh901318_remove(struct platform_device *pdev) | |||
2760 | 2760 | ||
2761 | 2761 | ||
2762 | static struct platform_driver coh901318_driver = { | 2762 | static struct platform_driver coh901318_driver = { |
2763 | .remove = __exit_p(coh901318_remove), | 2763 | .remove = coh901318_remove, |
2764 | .driver = { | 2764 | .driver = { |
2765 | .name = "coh901318", | 2765 | .name = "coh901318", |
2766 | }, | 2766 | }, |
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index 70b8975d107e..7d08ab7ff444 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c | |||
@@ -1145,7 +1145,7 @@ err: | |||
1145 | return ret; | 1145 | return ret; |
1146 | } | 1146 | } |
1147 | 1147 | ||
1148 | static int __exit imxdma_remove(struct platform_device *pdev) | 1148 | static int imxdma_remove(struct platform_device *pdev) |
1149 | { | 1149 | { |
1150 | struct imxdma_engine *imxdma = platform_get_drvdata(pdev); | 1150 | struct imxdma_engine *imxdma = platform_get_drvdata(pdev); |
1151 | 1151 | ||
@@ -1162,7 +1162,7 @@ static struct platform_driver imxdma_driver = { | |||
1162 | .name = "imx-dma", | 1162 | .name = "imx-dma", |
1163 | }, | 1163 | }, |
1164 | .id_table = imx_dma_devtype, | 1164 | .id_table = imx_dma_devtype, |
1165 | .remove = __exit_p(imxdma_remove), | 1165 | .remove = imxdma_remove, |
1166 | }; | 1166 | }; |
1167 | 1167 | ||
1168 | static int __init imxdma_module_init(void) | 1168 | static int __init imxdma_module_init(void) |
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index f082aa3a918c..092867bf795c 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c | |||
@@ -1462,7 +1462,7 @@ err_irq: | |||
1462 | return ret; | 1462 | return ret; |
1463 | } | 1463 | } |
1464 | 1464 | ||
1465 | static int __exit sdma_remove(struct platform_device *pdev) | 1465 | static int sdma_remove(struct platform_device *pdev) |
1466 | { | 1466 | { |
1467 | return -EBUSY; | 1467 | return -EBUSY; |
1468 | } | 1468 | } |
@@ -1473,7 +1473,7 @@ static struct platform_driver sdma_driver = { | |||
1473 | .of_match_table = sdma_dt_ids, | 1473 | .of_match_table = sdma_dt_ids, |
1474 | }, | 1474 | }, |
1475 | .id_table = sdma_devtypes, | 1475 | .id_table = sdma_devtypes, |
1476 | .remove = __exit_p(sdma_remove), | 1476 | .remove = sdma_remove, |
1477 | }; | 1477 | }; |
1478 | 1478 | ||
1479 | static int __init sdma_module_init(void) | 1479 | static int __init sdma_module_init(void) |
diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c index 8c61d17a86bf..d6d5d7eb3414 100644 --- a/drivers/dma/ipu/ipu_idmac.c +++ b/drivers/dma/ipu/ipu_idmac.c | |||
@@ -1756,7 +1756,7 @@ err_noirq: | |||
1756 | return ret; | 1756 | return ret; |
1757 | } | 1757 | } |
1758 | 1758 | ||
1759 | static int __exit ipu_remove(struct platform_device *pdev) | 1759 | static int ipu_remove(struct platform_device *pdev) |
1760 | { | 1760 | { |
1761 | struct ipu *ipu = platform_get_drvdata(pdev); | 1761 | struct ipu *ipu = platform_get_drvdata(pdev); |
1762 | 1762 | ||
@@ -1781,7 +1781,7 @@ static struct platform_driver ipu_platform_driver = { | |||
1781 | .name = "ipu-core", | 1781 | .name = "ipu-core", |
1782 | .owner = THIS_MODULE, | 1782 | .owner = THIS_MODULE, |
1783 | }, | 1783 | }, |
1784 | .remove = __exit_p(ipu_remove), | 1784 | .remove = ipu_remove, |
1785 | }; | 1785 | }; |
1786 | 1786 | ||
1787 | static int __init ipu_init(void) | 1787 | static int __init ipu_init(void) |
diff --git a/drivers/dma/txx9dmac.c b/drivers/dma/txx9dmac.c index 913f55c76c99..a59fb4841d4c 100644 --- a/drivers/dma/txx9dmac.c +++ b/drivers/dma/txx9dmac.c | |||
@@ -1190,7 +1190,7 @@ static int __init txx9dmac_chan_probe(struct platform_device *pdev) | |||
1190 | return 0; | 1190 | return 0; |
1191 | } | 1191 | } |
1192 | 1192 | ||
1193 | static int __exit txx9dmac_chan_remove(struct platform_device *pdev) | 1193 | static int txx9dmac_chan_remove(struct platform_device *pdev) |
1194 | { | 1194 | { |
1195 | struct txx9dmac_chan *dc = platform_get_drvdata(pdev); | 1195 | struct txx9dmac_chan *dc = platform_get_drvdata(pdev); |
1196 | 1196 | ||
@@ -1252,7 +1252,7 @@ static int __init txx9dmac_probe(struct platform_device *pdev) | |||
1252 | return 0; | 1252 | return 0; |
1253 | } | 1253 | } |
1254 | 1254 | ||
1255 | static int __exit txx9dmac_remove(struct platform_device *pdev) | 1255 | static int txx9dmac_remove(struct platform_device *pdev) |
1256 | { | 1256 | { |
1257 | struct txx9dmac_dev *ddev = platform_get_drvdata(pdev); | 1257 | struct txx9dmac_dev *ddev = platform_get_drvdata(pdev); |
1258 | 1258 | ||
@@ -1299,14 +1299,14 @@ static const struct dev_pm_ops txx9dmac_dev_pm_ops = { | |||
1299 | }; | 1299 | }; |
1300 | 1300 | ||
1301 | static struct platform_driver txx9dmac_chan_driver = { | 1301 | static struct platform_driver txx9dmac_chan_driver = { |
1302 | .remove = __exit_p(txx9dmac_chan_remove), | 1302 | .remove = txx9dmac_chan_remove, |
1303 | .driver = { | 1303 | .driver = { |
1304 | .name = "txx9dmac-chan", | 1304 | .name = "txx9dmac-chan", |
1305 | }, | 1305 | }, |
1306 | }; | 1306 | }; |
1307 | 1307 | ||
1308 | static struct platform_driver txx9dmac_driver = { | 1308 | static struct platform_driver txx9dmac_driver = { |
1309 | .remove = __exit_p(txx9dmac_remove), | 1309 | .remove = txx9dmac_remove, |
1310 | .shutdown = txx9dmac_shutdown, | 1310 | .shutdown = txx9dmac_shutdown, |
1311 | .driver = { | 1311 | .driver = { |
1312 | .name = "txx9dmac", | 1312 | .name = "txx9dmac", |