[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>

[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>
Adrian Bunk · Linus Torvalds
1 parent 40086ea17e
Showing 4 changed files with 2 additions and 10 deletions Side-by-side Diff
fs/partitions/Makefile
fs/partitions/check.c
fs/partitions/check.h
fs/partitions/msdos.c
@@ -17,5 +17,4 @@
 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
@@ -79,9 +79,6 @@
 #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
@@ -29,8 +29,4 @@
 }
  
 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);
@@ -202,12 +202,12 @@
 #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)
...	...	@@ -17,5 +17,4 @@
17	17	obj-$(CONFIG_ULTRIX_PARTITION) += ultrix.o
18	18	obj-$(CONFIG_IBM_PARTITION) += ibm.o
19	19	obj-$(CONFIG_EFI_PARTITION) += efi.o
20		-obj-$(CONFIG_NEC98_PARTITION) += nec98.o msdos.o
...	...	@@ -79,9 +79,6 @@
79	79	#ifdef CONFIG_LDM_PARTITION
80	80	ldm_partition, /* this must come before msdos */
81	81	#endif
82		-#ifdef CONFIG_NEC98_PARTITION
83		- nec98_partition, /* must be come before `msdos_partition' */
84		-#endif
85	82	#ifdef CONFIG_MSDOS_PARTITION
86	83	msdos_partition,
87	84	#endif
...	...	@@ -29,8 +29,4 @@
29	29	}
30	30
31	31	extern int warn_no_part;
32		-
33		-extern void parse_bsd(struct parsed_partitions *state,
34		- struct block_device *bdev, u32 offset, u32 size,
35		- int origin, char *flavour, int max_partitions);
...	...	@@ -202,12 +202,12 @@
202	202	#endif
203	203	}
204	204
205		-#if defined(CONFIG_BSD_DISKLABEL) \|\| defined(CONFIG_NEC98_PARTITION)
	205	+#if defined(CONFIG_BSD_DISKLABEL)
206	206	/*
207	207	* Create devices for BSD partitions listed in a disklabel, under a
208	208	* dos-like partition. See parse_extended() for more information.
209	209	*/
210		-void
	210	+static void
211	211	parse_bsd(struct parsed_partitions state, struct block_device bdev,
212	212	u32 offset, u32 size, int origin, char *flavour,
213	213	int max_partitions)