kernel/devel - module: fix driver examples

remove devinit for probe and devexit for unregister functions

add __init and __exit for init and exit functions

Signed-off-by: Manuel Traut <manut@linutronix.de>

8 files changed, 16 insertions, 17 deletions

diff --git a/kernel-devel/module-basics/pres_module-basics_en.tex b/kernel-devel/module-basics/pres_module-basics_en.tex
index 9827d3f..6ee58f5 100644
--- a/kernel-devel/module-basics/pres_module-basics_en.tex
+++ b/kernel-devel/module-basics/pres_module-basics_en.tex
@@ -19,7 +19,7 @@
 \item Init
 \begin{scriptsize}
 \begin{lstlisting}[frame=trBL]
-static int vain_init(void)
+static int __init vain_init(void)
 {
         printk(KERN_INFO "vain_init: done\n");
         return 0;
@@ -37,7 +37,7 @@ module_init(vain_init);
 \item Exit
 \begin{scriptsize}
 \begin{lstlisting}[frame=trBL]
-static void vain_exit(void)
+static void __exit vain_exit(void)
 {
         printk(KERN_INFO "vain_exit: done\n");
 }
@@ -150,7 +150,7 @@ vain_exit: done
 \item Init
 \begin{tiny}
 \begin{lstlisting}[frame=trBL]
-static int vain_pci_init(void)
+static int __init vain_pci_init(void)
 {
         int err;
 
@@ -173,7 +173,7 @@ module_init(vain_pci_init);
 \item Exit
 \begin{tiny}
 \begin{lstlisting}[frame=trBL]
-static void vain_pci_exit(void)
+static void __exit vain_pci_exit(void)
 {
         |pci_unregister_driver(&vain_pci_driver);|
         printk(KERN_INFO ``vain_pci_exit: done\n'');
@@ -335,7 +335,7 @@ module_exit(vain_pci_exit);
 \item Init
 \begin{tiny}
 \begin{lstlisting}[frame=trBL]
-static int vain_plat_init(void)
+static int __init vain_plat_init(void)
 {
         int err;
 
@@ -356,7 +356,7 @@ static int vain_plat_init(void)
 \item Exit
 \begin{tiny}
 \begin{lstlisting}[frame=trBL]
-static void vain_plat_exit(void)
+static void __exit vain_plat_exit(void)
 {
         |platform_driver_unregister(&vain_plat_driver);|
         printk(KERN_INFO ``vain_plat_exit: done\n'');
diff --git a/kernel-devel/module-basics/vain/vain.c b/kernel-devel/module-basics/vain/vain.c
index 97b421b..3c7377f 100644
--- a/kernel-devel/module-basics/vain/vain.c
+++ b/kernel-devel/module-basics/vain/vain.c
@@ -1,13 +1,12 @@
-#include <linux/init.h>
 #include <linux/module.h>
 
-static int vain_init(void)
+static int __init vain_init(void)
 {
 	printk(KERN_INFO "vain_init: done\n");
 	return 0;
 }
 
-static void vain_exit(void)
+static void __exit vain_exit(void)
 {
 	printk(KERN_INFO "vain_exit: done\n");
 }
diff --git a/kernel-devel/module-basics/vain_pci/vain_pci_2.c b/kernel-devel/module-basics/vain_pci/vain_pci_2.c
index cc4118d..e0cb791 100644
--- a/kernel-devel/module-basics/vain_pci/vain_pci_2.c
+++ b/kernel-devel/module-basics/vain_pci/vain_pci_2.c
@@ -1,4 +1,4 @@
-static int __devinit vain_pci_probe(struct pci_dev *pdev,
+static int vain_pci_probe(struct pci_dev *pdev,
 				    const struct pci_device_id *ent)
 {
 	struct vain_pci_info *info;
diff --git a/kernel-devel/module-basics/vain_pci/vain_pci_4.c b/kernel-devel/module-basics/vain_pci/vain_pci_4.c
index f238f22..518cb96 100644
--- a/kernel-devel/module-basics/vain_pci/vain_pci_4.c
+++ b/kernel-devel/module-basics/vain_pci/vain_pci_4.c
@@ -8,7 +8,7 @@ err_free:
 	return ret;
 }
 
-static void __devexit vain_pci_remove(struct pci_dev *pdev)
+static void vain_pci_remove(struct pci_dev *pdev)
 {
 	struct vain_pci_info *info = pci_get_drvdata(pdev);
 
diff --git a/kernel-devel/module-basics/vain_pci/vain_pci_orig.c b/kernel-devel/module-basics/vain_pci/vain_pci_orig.c
index 1d757e1..58cb532 100644
--- a/kernel-devel/module-basics/vain_pci/vain_pci_orig.c
+++ b/kernel-devel/module-basics/vain_pci/vain_pci_orig.c
@@ -18,7 +18,7 @@ static struct pci_device_id vain_pci_ids[] __devinitdata = {
 };
 MODULE_DEVICE_TABLE(pci, vain_pci_ids);
 
-static int __devinit vain_pci_probe(struct pci_dev *pdev,
+static int vain_pci_probe(struct pci_dev *pdev,
 				    const struct pci_device_id *ent)
 {
 	struct vain_pci_info *info;
@@ -68,7 +68,7 @@ err_free:
 	return ret;
 }
 
-static void __devexit vain_pci_remove(struct pci_dev *pdev)
+static void vain_pci_remove(struct pci_dev *pdev)
 {
 	struct vain_pci_info *info = pci_get_drvdata(pdev);
 
diff --git a/kernel-devel/module-basics/vain_plat/vain_plat_2.c b/kernel-devel/module-basics/vain_plat/vain_plat_2.c
index 9aa43e0..1e7e396 100644
--- a/kernel-devel/module-basics/vain_plat/vain_plat_2.c
+++ b/kernel-devel/module-basics/vain_plat/vain_plat_2.c
@@ -1,4 +1,4 @@
-static int __devinit vain_plat_probe(struct platform_device *pdev)
+static int vain_plat_probe(struct platform_device *pdev)
 {
 	struct vain_plat_info *info;
 	struct resource *res, *mem;
diff --git a/kernel-devel/module-basics/vain_plat/vain_plat_4.c b/kernel-devel/module-basics/vain_plat/vain_plat_4.c
index ed17836..12c8f95 100644
--- a/kernel-devel/module-basics/vain_plat/vain_plat_4.c
+++ b/kernel-devel/module-basics/vain_plat/vain_plat_4.c
@@ -1,4 +1,4 @@
-static int __devexit vain_plat_remove(struct platform_device *pdev)
+static int vain_plat_remove(struct platform_device *pdev)
 {
 	struct vain_plat_info *info = platform_get_drvdata(pdev);
 	struct resource *res;
diff --git a/kernel-devel/module-basics/vain_plat/vain_plat_orig.c b/kernel-devel/module-basics/vain_plat/vain_plat_orig.c
index 530407e..f5acb1e 100644
--- a/kernel-devel/module-basics/vain_plat/vain_plat_orig.c
+++ b/kernel-devel/module-basics/vain_plat/vain_plat_orig.c
@@ -10,7 +10,7 @@ struct vain_plat_info {
 	spinlock_t lock;
 };
 
-static int __devinit vain_plat_probe(struct platform_device *pdev)
+static int vain_plat_probe(struct platform_device *pdev)
 {
 	struct vain_plat_info *info;
 	struct resource *res, *mem;
@@ -55,7 +55,7 @@ out:
 	return err;
 }
 
-static int __devexit vain_plat_remove(struct platform_device *pdev)
+static int vain_plat_remove(struct platform_device *pdev)
 {
 	struct vain_plat_info *info = platform_get_drvdata(pdev);
 	struct resource *res;