The Kconfig currently controlling compilation of this code is: drivers/dma/Kconfig:config MMP_PDMA drivers/dma/Kconfig: bool "MMP PDMA support"
...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only. We explicitly disallow a driver unbind, since that doesn't have a sensible use case anyway, and it allows us to drop the ".remove" code for non-modular drivers. Since module_platform_driver() uses the same init level priority as builtin_platform_driver() the init ordering remains unchanged with this commit. Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code. We also delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments. Cc: Vinod Koul <[email protected]> Cc: Dan Williams <[email protected]> Cc: [email protected] Signed-off-by: Paul Gortmaker <[email protected]> --- drivers/dma/mmp_pdma.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/drivers/dma/mmp_pdma.c b/drivers/dma/mmp_pdma.c index e39457f13d4d..d41b74b6e852 100644 --- a/drivers/dma/mmp_pdma.c +++ b/drivers/dma/mmp_pdma.c @@ -1,5 +1,7 @@ /* + * MARVELL MMP Peripheral DMA Driver * Copyright 2012 Marvell International Ltd. + * Author: Marvell International Ltd. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -7,7 +9,6 @@ */ #include <linux/err.h> -#include <linux/module.h> #include <linux/init.h> #include <linux/types.h> #include <linux/interrupt.h> @@ -929,14 +930,6 @@ static void dma_do_tasklet(unsigned long data) } } -static int mmp_pdma_remove(struct platform_device *op) -{ - struct mmp_pdma_device *pdev = platform_get_drvdata(op); - - dma_async_device_unregister(&pdev->device); - return 0; -} - static int mmp_pdma_chan_init(struct mmp_pdma_device *pdev, int idx, int irq) { struct mmp_pdma_phy *phy = &pdev->phy[idx]; @@ -976,7 +969,6 @@ static const struct of_device_id mmp_pdma_dt_ids[] = { { .compatible = "marvell,pdma-1.0", }, {} }; -MODULE_DEVICE_TABLE(of, mmp_pdma_dt_ids); static struct dma_chan *mmp_pdma_dma_xlate(struct of_phandle_args *dma_spec, struct of_dma *ofdma) @@ -1110,12 +1102,13 @@ static const struct platform_device_id mmp_pdma_id_table[] = { static struct platform_driver mmp_pdma_driver = { .driver = { .name = "mmp-pdma", + .suppress_bind_attrs = true, .of_match_table = mmp_pdma_dt_ids, }, .id_table = mmp_pdma_id_table, .probe = mmp_pdma_probe, - .remove = mmp_pdma_remove, }; +builtin_platform_driver(mmp_pdma_driver); bool mmp_pdma_filter_fn(struct dma_chan *chan, void *param) { @@ -1129,9 +1122,3 @@ bool mmp_pdma_filter_fn(struct dma_chan *chan, void *param) return true; } EXPORT_SYMBOL_GPL(mmp_pdma_filter_fn); - -module_platform_driver(mmp_pdma_driver); - -MODULE_DESCRIPTION("MARVELL MMP Peripheral DMA Driver"); -MODULE_AUTHOR("Marvell International Ltd."); -MODULE_LICENSE("GPL v2"); -- 2.6.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
