[PATCH] small partitions/msdos cleanups

This patch makes the following changes to the msdos partition code:
- remove CONFIG_NEC98_PARTITION leftovers
- make parse_bsd static

This patch was already ACK'ed by Andries Brouwer.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/fs/partitions/Makefile b/fs/partitions/Makefile
index 4c83c17969e12505248dc0767985af06b568062e..66d5cc26fafbf65bfcdf4b18a0ee49c5e48ebbc7 100644 (file)
--- a/fs/partitions/Makefile
+++ b/fs/partitions/Makefile
@@ -17,4 +17,3 @@ obj-$(CONFIG_SUN_PARTITION) += sun.o
 obj-$(CONFIG_ULTRIX_PARTITION) += ultrix.o
 obj-$(CONFIG_IBM_PARTITION) += ibm.o
 obj-$(CONFIG_EFI_PARTITION) += efi.o
-obj-$(CONFIG_NEC98_PARTITION) += nec98.o msdos.o

diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 2cab98a9a621ce12a2f402688acb976b6a5ef9e8..77e178f13162abef0305852554dbfa73d2a99ff0 100644 (file)
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -79,9 +79,6 @@ static int (*check_part[])(struct parsed_partitions *, struct block_device *) =
 #ifdef CONFIG_LDM_PARTITION
        ldm_partition,          /* this must come before msdos */
 #endif
-#ifdef CONFIG_NEC98_PARTITION
-       nec98_partition,        /* must be come before `msdos_partition' */
-#endif
 #ifdef CONFIG_MSDOS_PARTITION
        msdos_partition,
 #endif

diff --git a/fs/partitions/check.h b/fs/partitions/check.h
index 43adcc68e47197c8bcc86dca3ae7327e2c5c43e9..17ae8ecd9e8b60afae6a8538d850ed7032477a4f 100644 (file)
--- a/fs/partitions/check.h
+++ b/fs/partitions/check.h
@@ -30,7 +30,3 @@ put_partition(struct parsed_partitions *p, int n, sector_t from, sector_t size)
 
 extern int warn_no_part;
 
-extern void parse_bsd(struct parsed_partitions *state,
-                       struct block_device *bdev, u32 offset, u32 size,
-                       int origin, char *flavour, int max_partitions);
-

diff --git a/fs/partitions/msdos.c b/fs/partitions/msdos.c
index 584a27b2bbd5a5cfc4317356a28efb3b42ef427f..9935d254186ef10276781815193995895b3dab8b 100644 (file)
--- a/fs/partitions/msdos.c
+++ b/fs/partitions/msdos.c
@@ -202,12 +202,12 @@ parse_solaris_x86(struct parsed_partitions *state, struct block_device *bdev,
 #endif
 }
 
-#if defined(CONFIG_BSD_DISKLABEL) || defined(CONFIG_NEC98_PARTITION)
+#if defined(CONFIG_BSD_DISKLABEL)
 /* 
  * Create devices for BSD partitions listed in a disklabel, under a
  * dos-like partition. See parse_extended() for more information.
  */
-void
+static void
 parse_bsd(struct parsed_partitions *state, struct block_device *bdev,
                u32 offset, u32 size, int origin, char *flavour,
                int max_partitions)