Skip to content

Commit

Permalink
dma: Remove erroneous __exit and __exit_p() references
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Maxin B. John authored and Vinod Koul committed Apr 15, 2013
1 parent 234846d commit 1d1bbd3
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions drivers/dma/at_hdmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1407,7 +1407,7 @@ static int __init at_dma_probe(struct platform_device *pdev)
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;
Expand Down Expand Up @@ -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 = {
Expand Down
4 changes: 2 additions & 2 deletions drivers/dma/coh901318.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2748,7 +2748,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);

Expand All @@ -2760,7 +2760,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",
},
Expand Down
4 changes: 2 additions & 2 deletions drivers/dma/imx-dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1145,7 +1145,7 @@ static int __init imxdma_probe(struct platform_device *pdev)
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);

Expand All @@ -1162,7 +1162,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)
Expand Down
4 changes: 2 additions & 2 deletions drivers/dma/imx-sdma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1462,7 +1462,7 @@ static int __init sdma_probe(struct platform_device *pdev)
return ret;
}

static int __exit sdma_remove(struct platform_device *pdev)
static int sdma_remove(struct platform_device *pdev)
{
return -EBUSY;
}
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions drivers/dma/ipu/ipu_idmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1756,7 +1756,7 @@ static int __init ipu_probe(struct platform_device *pdev)
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);

Expand All @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions drivers/dma/txx9dmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 1d1bbd3

Please sign in to comment.