diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-05 02:45:21 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-22 16:43:31 -0500 |
| commit | 8bad6cb176a0e92ac8e7771fb68e5e0713edbf8e (patch) | |
| tree | f2a0ac7244dd88ef1d379b4a79ba04d2b4010c1d /fs | |
| parent | e8df14d216f483d32f9daaf236686d1613b3f871 (diff) | |
fs: fat: Drop CONFIG_SUPPORT_VFAT
fat.h unconditionally defines CONFIG_SUPPORT_VFAT (and has done since
2003), so as a result VFAT support is always enabled regardless of
whether a board config defines it or not. Drop this unnecessary option.
Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/fat/fat.c | 12 | ||||
| -rw-r--r-- | fs/fat/fat_write.c | 3 |
2 files changed, 2 insertions, 13 deletions
diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 1283818761..dd7888cd6d 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -22,12 +22,6 @@ #include <linux/compiler.h> #include <linux/ctype.h> -#ifdef CONFIG_SUPPORT_VFAT -static const int vfat_enabled = 1; -#else -static const int vfat_enabled = 0; -#endif - /* * Convert a string to lowercase. Converts at most 'len' characters, * 'len' may be larger than the length of 'str' if 'str' is NULL @@ -605,9 +599,6 @@ static int get_fs_info(fsdata *mydata) return -1; } - if (vfat_enabled) - debug("VFAT Support enabled\n"); - debug("FAT%d, fat_sect: %d, fatlength: %d\n", mydata->fatsize, mydata->fat_sect, mydata->fatlength); debug("Rootdir begins at cluster: %d, sector: %d, offset: %x\n" @@ -857,8 +848,7 @@ static int fat_itr_next(fat_itr *itr) continue; if (dent->attr & ATTR_VOLUME) { - if (vfat_enabled && - (dent->attr & ATTR_VFAT) == ATTR_VFAT && + if ((dent->attr & ATTR_VFAT) == ATTR_VFAT && (dent->name[0] & LAST_LONG_ENTRY_MASK)) { dent = extract_vfat_name(itr); if (!dent) diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index cd65192da5..2b753df282 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -819,8 +819,7 @@ static dir_entry *find_directory_entry(fsdata *mydata, int startsect, continue; } if ((dentptr->attr & ATTR_VOLUME)) { - if (vfat_enabled && - (dentptr->attr & ATTR_VFAT) && + if ((dentptr->attr & ATTR_VFAT) && (dentptr->name[0] & LAST_LONG_ENTRY_MASK)) { get_long_file_name(mydata, curclust, get_dentfromdir_block, |