nls: fix (and rename) mac NLS table files and config options

The config options in the Kconfig file (with _CODEPAGE_ in the name)
didn't match the config option name in the Makefile (no _CODEPAGE_).

And both of them were of the hard-to-read MACXYZZY variety, which made
them hard to parse for normal humans: MACROMAN easily reads as "macro
man", not as "Mac Roman".

So rename the options to be consistent, and be NLS_MAC_xyzzy.  Rename
the files to be mac-xyzzy.c too, and drop the "nls" part entirely (it's
already in the directory name).

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 11 insertions, 11 deletions

diff --git a/fs/nls/Kconfig b/fs/nls/Kconfig
index b5eac98fd7bd..e2ce79ef48c4 100644
--- a/fs/nls/Kconfig
+++ b/fs/nls/Kconfig
@@ -452,7 +452,7 @@ config NLS_KOI8_U
           input/output character sets. Say Y here for the preferred Ukrainian
           (koi8-u) and Belarusian (koi8-ru) character sets.
 
-config NLS_CODEPAGE_MACROMAN
+config NLS_MAC_ROMAN
         tristate "Codepage macroman"
         ---help---
           The Apple HFS file system family can deal with filenames in
@@ -467,7 +467,7 @@ config NLS_CODEPAGE_MACROMAN
 
           If unsure, say Y.
 
-config NLS_CODEPAGE_MACCELTIC
+config NLS_MAC_CELTIC
         tristate "Codepage macceltic"
         ---help---
           The Apple HFS file system family can deal with filenames in
@@ -481,7 +481,7 @@ config NLS_CODEPAGE_MACCELTIC
 
           If unsure, say Y.
 
-config NLS_CODEPAGE_MACCENTEURO
+config NLS_MAC_CENTEURO
         tristate "Codepage maccenteuro"
         ---help---
           The Apple HFS file system family can deal with filenames in
@@ -495,7 +495,7 @@ config NLS_CODEPAGE_MACCENTEURO
 
           If unsure, say Y.
 
-config NLS_CODEPAGE_MACCROATIAN
+config NLS_MAC_CROATIAN
         tristate "Codepage maccroatian"
         ---help---
           The Apple HFS file system family can deal with filenames in
@@ -509,7 +509,7 @@ config NLS_CODEPAGE_MACCROATIAN
 
           If unsure, say Y.
 
-config NLS_CODEPAGE_MACCYRILLIC
+config NLS_MAC_CYRILLIC
         tristate "Codepage maccyrillic"
         ---help---
           The Apple HFS file system family can deal with filenames in
@@ -523,7 +523,7 @@ config NLS_CODEPAGE_MACCYRILLIC
 
           If unsure, say Y.
 
-config NLS_CODEPAGE_MACGAELIC
+config NLS_MAC_GAELIC
         tristate "Codepage macgaelic"
         ---help---
           The Apple HFS file system family can deal with filenames in
@@ -537,7 +537,7 @@ config NLS_CODEPAGE_MACGAELIC
 
           If unsure, say Y.
 
-config NLS_CODEPAGE_MACGREEK
+config NLS_MAC_GREEK
         tristate "Codepage macgreek"
         ---help---
           The Apple HFS file system family can deal with filenames in
@@ -551,7 +551,7 @@ config NLS_CODEPAGE_MACGREEK
 
           If unsure, say Y.
 
-config NLS_CODEPAGE_MACICELAND
+config NLS_MAC_ICELAND
         tristate "Codepage maciceland"
         ---help---
           The Apple HFS file system family can deal with filenames in
@@ -565,7 +565,7 @@ config NLS_CODEPAGE_MACICELAND
 
           If unsure, say Y.
 
-config NLS_CODEPAGE_MACINUIT
+config NLS_MAC_INUIT
         tristate "Codepage macinuit"
         ---help---
           The Apple HFS file system family can deal with filenames in
@@ -579,7 +579,7 @@ config NLS_CODEPAGE_MACINUIT
 
           If unsure, say Y.
 
-config NLS_CODEPAGE_MACROMANIAN
+config NLS_MAC_ROMANIAN
         tristate "Codepage macromanian"
         ---help---
           The Apple HFS file system family can deal with filenames in
@@ -593,7 +593,7 @@ config NLS_CODEPAGE_MACROMANIAN
 
           If unsure, say Y.
 
-config NLS_CODEPAGE_MACTURKISH
+config NLS_MAC_TURKISH
         tristate "Codepage macturkish"
         ---help---
           The Apple HFS file system family can deal with filenames in