[PATCH 3/3] Revert "staging: nvec: replace module_platform register by module_init"

[Marc Dietrich <marvin24@xxxxxx>]

This reverts commit 8e065accc114ee5d939c8c63fbb28230bceb4525. Now that modules can
be savely unloaded, this change is no longe necessary.

Signed-off-by: Marc Dietrich <marvin24@xxxxxx>
---
Greg,

I don't know how far you are with merging the previous patch set, but alternatively
(and if this patch series can still go into staging-next), you could skip the
"nvec: replace modules_platform register by module_init" and this patch here.

Marc


 drivers/staging/nvec/nvec.c       |    6 +-----
 drivers/staging/nvec/nvec_kbd.c   |    6 +-----
 drivers/staging/nvec/nvec_paz00.c |    6 +-----
 drivers/staging/nvec/nvec_power.c |    6 +-----
 drivers/staging/nvec/nvec_ps2.c   |    6 +-----
 5 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c
index 7bac72a..131b08d 100644
--- a/drivers/staging/nvec/nvec.c
+++ b/drivers/staging/nvec/nvec.c
@@ -979,11 +979,7 @@ static struct platform_driver nvec_device_driver = {
 	}
 };
 
-static int __init nvec_init(void)
-{
-	return platform_driver_register(&nvec_device_driver);
-}
-module_init(nvec_init);
+module_platform_driver(nvec_device_driver);
 
 MODULE_ALIAS("platform:nvec");
 MODULE_DESCRIPTION("NVIDIA compliant embedded controller interface");
diff --git a/drivers/staging/nvec/nvec_kbd.c b/drivers/staging/nvec/nvec_kbd.c
index 694167e..a0ec52a 100644
--- a/drivers/staging/nvec/nvec_kbd.c
+++ b/drivers/staging/nvec/nvec_kbd.c
@@ -191,11 +191,7 @@ static struct platform_driver nvec_kbd_driver = {
 	},
 };
 
-static int __init nvec_kbd_init(void)
-{
-	return platform_driver_register(&nvec_kbd_driver);
-}
-module_init(nvec_kbd_init);
+module_platform_driver(nvec_kbd_driver);
 
 MODULE_AUTHOR("Marc Dietrich <marvin24@xxxxxx>");
 MODULE_DESCRIPTION("NVEC keyboard driver");
diff --git a/drivers/staging/nvec/nvec_paz00.c b/drivers/staging/nvec/nvec_paz00.c
index 5b54e31..934b796 100644
--- a/drivers/staging/nvec/nvec_paz00.c
+++ b/drivers/staging/nvec/nvec_paz00.c
@@ -90,11 +90,7 @@ static struct platform_driver nvec_paz00_driver = {
 	},
 };
 
-static int __init nvec_paz00_init(void)
-{
-	return platform_driver_register(&nvec_paz00_driver);
-}
-module_init(nvec_paz00_init);
+module_platform_driver(nvec_paz00_driver);
 
 MODULE_AUTHOR("Ilya Petrov <ilya.muromec@xxxxxxxxx>");
 MODULE_DESCRIPTION("Tegra NVEC PAZ00 driver");
diff --git a/drivers/staging/nvec/nvec_power.c b/drivers/staging/nvec/nvec_power.c
index 1c7bdb5..aacfcd6 100644
--- a/drivers/staging/nvec/nvec_power.c
+++ b/drivers/staging/nvec/nvec_power.c
@@ -435,11 +435,7 @@ static struct platform_driver nvec_power_driver = {
 		   }
 };
 
-static int __init nvec_power_init(void)
-{
-	return platform_driver_register(&nvec_power_driver);
-}
-module_init(nvec_power_init);
+module_platform_driver(nvec_power_driver);
 
 MODULE_AUTHOR("Ilya Petrov <ilya.muromec@xxxxxxxxx>");
 MODULE_LICENSE("GPL");
diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps2.c
index 93c6925..06dbb02 100644
--- a/drivers/staging/nvec/nvec_ps2.c
+++ b/drivers/staging/nvec/nvec_ps2.c
@@ -180,11 +180,7 @@ static struct platform_driver nvec_mouse_driver = {
 	},
 };
 
-static int __init nvec_mouse_init(void)
-{
-	return platform_driver_register(&nvec_mouse_driver);
-}
-module_init(nvec_mouse_init);
+module_platform_driver(nvec_mouse_driver);
 
 MODULE_DESCRIPTION("NVEC mouse driver");
 MODULE_AUTHOR("Marc Dietrich <marvin24@xxxxxx>");
-- 
1.7.9.5

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel