patch-2.3.99-pre1 linux/fs/nls/nls_iso8859-1.c

Next file: linux/fs/nls/nls_iso8859-14.c
Previous file: linux/fs/nls/nls_cp874.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.51/linux/fs/nls/nls_iso8859-1.c linux/fs/nls/nls_iso8859-1.c
@@ -207,46 +207,27 @@
 	0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0x00, /* 0xf8-0xff */
 };
 
-
-static void inc_use_count(void)
-{
-	MOD_INC_USE_COUNT;
-}
-
-static void dec_use_count(void)
-{
-	MOD_DEC_USE_COUNT;
-}
-
 static struct nls_table table = {
 	"iso8859-1",
 	page_uni2charset,
 	charset2uni,
 	charset2lower,
 	charset2upper,
-	inc_use_count,
-	dec_use_count,
-	NULL
+	THIS_MODULE,
 };
 
-int init_nls_iso8859_1(void)
+static int __init init_nls_iso8859_1(void)
 {
 	return register_nls(&table);
 }
 
-#ifdef MODULE
-int init_module(void)
-{
-	return init_nls_iso8859_1();
-}
-
-
-void cleanup_module(void)
+static void __exit exit_nls_iso8859_1(void)
 {
 	unregister_nls(&table);
-	return;
 }
-#endif
+
+module_init(init_nls_iso8859_1)
+module_exit(exit_nls_iso8859_1)
 
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)