drivers/dma: make mv_xor.c driver explicitly non-modular
PATCH 1/1 drivers/dma: make mv_xor.c driver explicitly non-modular
The Kconfig for this driver is currently:
config MV_XOR
bool "Marvell XOR engine 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.
Since module_init translates to device_initcall in the non-modular case, the init ordering remains unchanged with this commit.
We leave some tags like MODULE_AUTHOR for documentation purposes. Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code.
drivers/dma/mv_xor.c +3 -33
@@ -13,7 +13,6 @@*/ #include <linux/init.h> -#include <linux/module.h> #include <linux/slab.h> #include <linux/delay.h> #include <linux/dma-mapping.h>
@@ -1125,7 +1124,6 @@ static const struct of_device_id mv_xor_dt_ids[] = { { .compatible = "marvell,armada-380-xor", .data = (void *)XOR_MODE_IN_DESC }, {}, }; -MODULE_DEVICE_TABLE (of, mv_xor_dt_ids);static int mv_xor_probe (struct platform_device *pdev) {
@@ -1262,27 +1260,8 @@ err_channel_add:return ret; } -static int mv_xor_remove (struct platform_device *pdev) -{ -struct mv_xor_device *xordev =platform_get_drvdata (pdev); -int i; - -for (i =0 ; i <MV_XOR_MAX_CHANNELS ; i++) { -if (xordev->channels[i]) -mv_xor_channel_remove (xordev->channels[i]); - } - -if (!IS_ERR (xordev->clk)) { -clk_disable_unprepare (xordev->clk); -clk_put (xordev->clk); - } - -return 0 ; -} -static struct platform_driver mv_xor_driver = { .probe = mv_xor_probe, - .remove = mv_xor_remove, .driver = { .name =MV_XOR_NAME , .of_match_table =of_match_ptr (mv_xor_dt_ids),
@@ -1294,19 +1273,10 @@ static int __init mv_xor_init(void) {return platform_driver_register (&mv_xor_driver); } -module_init (mv_xor_init); - -/* it's currently unsafe to unload this module */ -#if 0 -static void __exit mv_xor_exit(void) -{ -platform_driver_unregister (&mv_xor_driver); -return ; -} - -module_exit (mv_xor_exit); -#endif +device_initcall (mv_xor_init); +/* MODULE_AUTHOR("Saeed Bishara <[email protected]>"); MODULE_DESCRIPTION("DMA engine driver for Marvell's XOR engine"); MODULE_LICENSE("GPL"); +*/
Signature · 1 line
2.2.1
Vinod Koul
AppliedQuoted 9 lines · Paul Gortmaker
The
Kconfigfor this driver is currently:config
MV_XOR
bool "Marvell XOR engine 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.
Quoted 5 lines
Since
module_inittranslates todevice_initcallin the non-modular case, the init ordering remains unchanged with this commit.We leave some tags like
MODULE_AUTHORfor documentation purposes. Also note thatMODULE_DEVICE_TABLEis a no-op for non-modular code.
Applied, thanks
Signature · 1 line
~Vinod