nls: have register_nls() set ->owner

pass owner explicitly to __register_nls(), make register_nls() a macro passing
THIS_MODULE as the owner argument to __register_nls().

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/nls/mac-celtic.c b/fs/nls/mac-celtic.c
index 634a8b7..266c2d7 100644 (file)
--- a/fs/nls/mac-celtic.c
+++ b/fs/nls/mac-celtic.c
@@ -583,7 +583,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_macceltic(void)

diff --git a/fs/nls/mac-centeuro.c b/fs/nls/mac-centeuro.c
index 979e626..9789c60 100644 (file)
--- a/fs/nls/mac-centeuro.c
+++ b/fs/nls/mac-centeuro.c
@@ -513,7 +513,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_maccenteuro(void)

diff --git a/fs/nls/mac-croatian.c b/fs/nls/mac-croatian.c
index dd3f675..bb19e7a 100644 (file)
--- a/fs/nls/mac-croatian.c
+++ b/fs/nls/mac-croatian.c
@@ -583,7 +583,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_maccroatian(void)

diff --git a/fs/nls/mac-cyrillic.c b/fs/nls/mac-cyrillic.c
index 1112c84..2a7dea3 100644 (file)
--- a/fs/nls/mac-cyrillic.c
+++ b/fs/nls/mac-cyrillic.c
@@ -478,7 +478,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_maccyrillic(void)

diff --git a/fs/nls/mac-gaelic.c b/fs/nls/mac-gaelic.c
index 2de9158..77b0016 100644 (file)
--- a/fs/nls/mac-gaelic.c
+++ b/fs/nls/mac-gaelic.c
@@ -548,7 +548,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_macgaelic(void)

diff --git a/fs/nls/mac-greek.c b/fs/nls/mac-greek.c
index a863100..1eccf49 100644 (file)
--- a/fs/nls/mac-greek.c
+++ b/fs/nls/mac-greek.c
@@ -478,7 +478,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_macgreek(void)

diff --git a/fs/nls/mac-iceland.c b/fs/nls/mac-iceland.c
index babe299..cbd0875 100644 (file)
--- a/fs/nls/mac-iceland.c
+++ b/fs/nls/mac-iceland.c
@@ -583,7 +583,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_maciceland(void)

diff --git a/fs/nls/mac-inuit.c b/fs/nls/mac-inuit.c
index 312364f..fba8357 100644 (file)
--- a/fs/nls/mac-inuit.c
+++ b/fs/nls/mac-inuit.c
@@ -513,7 +513,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_macinuit(void)

diff --git a/fs/nls/mac-roman.c b/fs/nls/mac-roman.c
index 53ce080..b6a98a5 100644 (file)
--- a/fs/nls/mac-roman.c
+++ b/fs/nls/mac-roman.c
@@ -618,7 +618,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_macroman(void)

diff --git a/fs/nls/mac-romanian.c b/fs/nls/mac-romanian.c
index add6f7a..25547f0 100644 (file)
--- a/fs/nls/mac-romanian.c
+++ b/fs/nls/mac-romanian.c
@@ -583,7 +583,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_macromanian(void)

diff --git a/fs/nls/mac-turkish.c b/fs/nls/mac-turkish.c
index dffa96d..b5454bc 100644 (file)
--- a/fs/nls/mac-turkish.c
+++ b/fs/nls/mac-turkish.c
@@ -583,7 +583,6 @@ static struct nls_table table = {
        .char2uni       = char2uni,
        .charset2lower  = charset2lower,
        .charset2upper  = charset2upper,
-       .owner          = THIS_MODULE,
 };
 
 static int __init init_nls_macturkish(void)

diff --cc fs/nls/nls_ascii.c
Simple merge

diff --cc fs/nls/nls_base.c
Simple merge

diff --cc fs/nls/nls_cp1250.c
Simple merge

diff --cc fs/nls/nls_cp1251.c
Simple merge

diff --cc fs/nls/nls_cp1255.c
Simple merge

diff --cc fs/nls/nls_cp437.c
Simple merge

diff --cc fs/nls/nls_cp737.c
Simple merge

diff --cc fs/nls/nls_cp775.c
Simple merge

diff --cc fs/nls/nls_cp850.c
Simple merge

diff --cc fs/nls/nls_cp852.c
Simple merge

diff --cc fs/nls/nls_cp855.c
Simple merge

diff --cc fs/nls/nls_cp857.c
Simple merge

diff --cc fs/nls/nls_cp860.c
Simple merge

diff --cc fs/nls/nls_cp861.c
Simple merge

diff --cc fs/nls/nls_cp862.c
Simple merge

diff --cc fs/nls/nls_cp863.c
Simple merge

diff --cc fs/nls/nls_cp864.c
Simple merge

diff --cc fs/nls/nls_cp865.c
Simple merge

diff --cc fs/nls/nls_cp866.c
Simple merge

diff --cc fs/nls/nls_cp869.c
Simple merge

diff --cc fs/nls/nls_cp874.c
Simple merge

diff --cc fs/nls/nls_cp932.c
Simple merge

diff --cc fs/nls/nls_cp936.c
Simple merge

diff --cc fs/nls/nls_cp949.c
Simple merge

diff --cc fs/nls/nls_cp950.c
Simple merge

diff --cc fs/nls/nls_euc-jp.c
Simple merge

diff --cc fs/nls/nls_iso8859-1.c
Simple merge

diff --cc fs/nls/nls_iso8859-13.c
Simple merge

diff --cc fs/nls/nls_iso8859-14.c
Simple merge

diff --cc fs/nls/nls_iso8859-15.c
Simple merge

diff --cc fs/nls/nls_iso8859-2.c
Simple merge

diff --cc fs/nls/nls_iso8859-3.c
Simple merge

diff --cc fs/nls/nls_iso8859-4.c
Simple merge

diff --cc fs/nls/nls_iso8859-5.c
Simple merge

diff --cc fs/nls/nls_iso8859-6.c
Simple merge

diff --cc fs/nls/nls_iso8859-7.c
Simple merge

diff --cc fs/nls/nls_iso8859-9.c
Simple merge

diff --cc fs/nls/nls_koi8-r.c
Simple merge

diff --cc fs/nls/nls_koi8-ru.c
Simple merge

diff --cc fs/nls/nls_koi8-u.c
Simple merge

diff --cc fs/nls/nls_utf8.c
Simple merge

diff --cc include/linux/nls.h
Simple merge