dma: Remove erroneous __exit and __exit_p() references
Subsystems (3)
PATCH 1/1 dma: Remove erroneous __exit and __exit_p() references
From: "Maxin B. John" <[email protected]>
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.
--- drivers/dma/at_hdmac.c | 4 ++-- drivers/dma/coh901318.c | 4 ++-- drivers/dma/imx-dma.c | 4 ++-- drivers/dma/imx-sdma.c | 4 ++-- drivers/dma/ipu/ipu_idmac.c | 4 ++-- drivers/dma/txx9dmac.c | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-)
drivers/dma/at_hdmac.c +2 -2
@@ -1407,7 +1407,7 @@ err_kfree:return err; } -static int __exit at_dma_remove(struct platform_device *pdev) +static int at_dma_remove (struct platform_device *pdev) {struct at_dma *atdma =platform_get_drvdata (pdev);struct dma_chan *chan, *_chan;
@@ -1565,7 +1565,7 @@ static const struct dev_pm_ops at_dma_dev_pm_ops = { };static struct platform_driver at_dma_driver = { - .remove =__exit_p (at_dma_remove), + .remove = at_dma_remove, .shutdown = at_dma_shutdown, .id_table = atdma_devtypes, .driver = {
drivers/dma/coh901318.c +2 -2
@@ -1544,7 +1544,7 @@ static int __init coh901318_probe(struct platform_device *pdev)return err; } -static int __exit coh901318_remove(struct platform_device *pdev) +static int coh901318_remove (struct platform_device *pdev) {struct coh901318_base *base =platform_get_drvdata (pdev);
@@ -1556,7 +1556,7 @@ static int __exit coh901318_remove(struct platform_device *pdev)static struct platform_driver coh901318_driver = { - .remove =__exit_p (coh901318_remove), + .remove = coh901318_remove, .driver = { .name ="coh901318" , },
drivers/dma/imx-dma.c +2 -2
@@ -1144,7 +1144,7 @@ err:return ret; } -static int __exit imxdma_remove(struct platform_device *pdev) +static int imxdma_remove (struct platform_device *pdev) {struct imxdma_engine *imxdma =platform_get_drvdata (pdev);
@@ -1161,7 +1161,7 @@ static struct platform_driver imxdma_driver = { .name = "imx-dma", }, .id_table = imx_dma_devtype, - .remove = __exit_p(imxdma_remove), + .remove = imxdma_remove, };static int __init imxdma_module_init (void )
drivers/dma/imx-sdma.c +2 -2
@@ -1462,7 +1462,7 @@ err_irq:return ret; } -static int __exit sdma_remove(struct platform_device *pdev) +static int sdma_remove (struct platform_device *pdev) {return -EBUSY ; }
@@ -1473,7 +1473,7 @@ static struct platform_driver sdma_driver = { .of_match_table = sdma_dt_ids, }, .id_table = sdma_devtypes, - .remove = __exit_p(sdma_remove), + .remove = sdma_remove, };static int __init sdma_module_init (void )
drivers/dma/ipu/ipu_idmac.c +2 -2
@@ -1756,7 +1756,7 @@ err_noirq:return ret; } -static int __exit ipu_remove(struct platform_device *pdev) +static int ipu_remove (struct platform_device *pdev) {struct ipu *ipu =platform_get_drvdata (pdev);
@@ -1781,7 +1781,7 @@ static struct platform_driver ipu_platform_driver = { .name = "ipu-core", .owner = THIS_MODULE, }, - .remove = __exit_p(ipu_remove), + .remove = ipu_remove, };static int __init ipu_init (void )
drivers/dma/txx9dmac.c +4 -4
@@ -1190,7 +1190,7 @@ static int __init txx9dmac_chan_probe(struct platform_device *pdev)return 0 ; } -static int __exit txx9dmac_chan_remove(struct platform_device *pdev) +static int txx9dmac_chan_remove (struct platform_device *pdev) {struct txx9dmac_chan *dc =platform_get_drvdata (pdev);
@@ -1252,7 +1252,7 @@ static int __init txx9dmac_probe(struct platform_device *pdev)return 0 ; } -static int __exit txx9dmac_remove(struct platform_device *pdev) +static int txx9dmac_remove (struct platform_device *pdev) {struct txx9dmac_dev *ddev =platform_get_drvdata (pdev);
@@ -1299,14 +1299,14 @@ static const struct dev_pm_ops txx9dmac_dev_pm_ops = { };static struct platform_driver txx9dmac_chan_driver = { - .remove =__exit_p (txx9dmac_chan_remove), + .remove = txx9dmac_chan_remove, .driver = { .name ="txx9dmac-chan" , }, };static struct platform_driver txx9dmac_driver = { - .remove =__exit_p (txx9dmac_remove), + .remove = txx9dmac_remove, .shutdown = txx9dmac_shutdown, .driver = { .name ="txx9dmac" ,
Signature · 1 line
1.7.7
Quoted 8 lines · On Wed, Feb 20, 2013 at 1:07 AM, <[email protected]> wrote:
From: "Maxin B. John" <[email protected]>
Removing the annotation with
__exitand referencing with__exit_p()present in dma driver module remove hooks.Part of the
__devexitand__devexit_p()purge.Signed-off-by Maxin B. John <[email protected]>
Yours,
Linus Walleij
Hi,
Quoted 4 lines · Linus Walleij
Quoted 2 lines · On Wed, Feb 20, 2013 at 1:07 AM, <[email protected]> wrote:
From: "Maxin B. John" <[email protected]>
Quoted 8 lines
Quoted 6 lines
Removing the annotation with
__exitand referencing with__exit_p()present in dma driver module remove hooks.Part of the
__devexitand__devexit_p()purge.Signed-off-by Maxin B. John <[email protected]>Acked-by Linus Walleij <[email protected]>
Gentle ping...
Quoted 2 lines
Yours,
Linus Walleij
Regards,
Maxin
Quoted 10 lines · Maxin B. John
Hi,
Quoted 7 lines · Linus Walleij
Quoted 5 lines · On Wed, Feb 20, 2013 at 1:07 AM, <[email protected]> wrote:
From: "Maxin B. John" <[email protected]>
Removing the annotation with
__exitand referencing with__exit_p()present in dma driver module remove hooks.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Part of the
__devexitand__devexit_p()purge.Signed-off-by Maxin B. John <[email protected]>Acked-by Linus Walleij <[email protected]>Gentle ping...
???
Its already in my -next
--
~Vinod
Hi Vinod,
Quoted 13 lines · Vinod Koul
Quoted 12 lines · Maxin B. John
Hi,
Quoted 9 lines · Linus Walleij
Quoted 7 lines · On Wed, Feb 20, 2013 at 1:07 AM, <[email protected]> wrote:
From: "Maxin B. John" <[email protected]>
Removing the annotation with
__exitand referencing with__exit_p()present in dma driver module remove hooks.Part of the
__devexitand__devexit_p()purge.
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Maxin B. John <[email protected]>Acked-by Linus Walleij <[email protected]>Gentle ping...
???
Its already in my -next
In that case, sorry for creating confusion. I was under the impression that only the patch titled "dma: timb_dma: Fix compiler warning" was accepted in "-next".
Quoted 1 line
~Vinod
Warm Regards,
Maxin
Quoted 13 lines · Vinod Koul
Quoted 12 lines · Maxin B. John
Hi,
Quoted 9 lines · Linus Walleij
Quoted 7 lines · On Wed, Feb 20, 2013 at 1:07 AM, <[email protected]> wrote:
From: "Maxin B. John" <[email protected]>
Removing the annotation with
__exitand referencing with__exit_p()present in dma driver module remove hooks.Part of the
__devexitand__devexit_p()purge.
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Maxin B. John <[email protected]>Acked-by Linus Walleij <[email protected]>Gentle ping...
???
Its already in my -next
Sorry, I have confused with your other patch, applying now...
Quoted 3 lines
--
~Vinod