From: Karel Zak <kzak@redhat.com>
Date: Fri, 7 Jun 2013 13:34:39 +0000 (+0200)
Subject: fdisk: (sgi) remove dead code
X-Git-Tag: v2.24-rc1~210
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c88006509601070adc944b67210fa6c8b5d7962a;p=thirdparty%2Futil-linux.git

fdisk: (sgi) remove dead code

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
index c6d89031e6..0652cb3103 100644
--- a/fdisks/fdisk.c
+++ b/fdisks/fdisk.c
@@ -740,10 +740,8 @@ expert_command_prompt(struct fdisk_context *cxt)
 			print_raw(cxt);
 			break;
 		case 'e':
-			if (fdisk_is_disklabel(cxt, SGI))
-				sgi_set_xcyl();
-			else if (fdisk_is_disklabel(cxt, DOS))
-					dos_list_table_expert(cxt, 1);
+			if (fdisk_is_disklabel(cxt, DOS))
+				dos_list_table_expert(cxt, 1);
 			break;
 		case 'f':
 			if (fdisk_is_disklabel(cxt, DOS))
diff --git a/fdisks/fdisksgilabel.c b/fdisks/fdisksgilabel.c
index ddeeca9966..1c51ee346e 100644
--- a/fdisks/fdisksgilabel.c
+++ b/fdisks/fdisksgilabel.c
@@ -391,8 +391,8 @@ int sgi_get_swappartition(struct fdisk_context *cxt)
 	return be16_to_cpu(sgilabel->swap_part_num);
 }
 
-static unsigned int
-sgi_get_lastblock(struct fdisk_context *cxt) {
+static unsigned int sgi_get_lastblock(struct fdisk_context *cxt)
+{
 	return cxt->geom.heads * cxt->geom.sectors * cxt->geom.cylinders;
 }
 
@@ -511,9 +511,8 @@ static int compare_start(struct fdisk_context *cxt,
 			 const void *x, const void *y)
 {
 	/*
-	 * sort according to start sectors
-	 * and prefers largest partition:
-	 * entry zero is entire disk entry
+	 * sort according to start sectors and prefers largest partition: entry
+	 * zero is entire disk entry
 	 */
 	unsigned int i = *(int *) x;
 	unsigned int j = *(int *) y;
@@ -1038,34 +1037,6 @@ static int sgi_create_disklabel(struct fdisk_context *cxt)
 	return 0;
 }
 
-void sgi_set_ilfact(void)
-{
-	/* do nothing in the beginning */
-}
-
-void sgi_set_rspeed(void)
-{
-	/* do nothing in the beginning */
-}
-
-void sgi_set_pcylcount(void)
-{
-	/* do nothing in the beginning */
-}
-
-void sgi_set_xcyl(void)
-{
-	/* do nothing in the beginning */
-}
-
-void sgi_set_ncyl(void)
-{
-	/* do nothing in the beginning */
-}
-
-/* _____________________________________________________________
- */
-
 static struct fdisk_parttype *sgi_get_parttype(struct fdisk_context *cxt, size_t n)
 {
 	struct fdisk_parttype *t;
diff --git a/fdisks/fdisksgilabel.h b/fdisks/fdisksgilabel.h
index de333c13bf..dfbd40f4dd 100644
--- a/fdisks/fdisksgilabel.h
+++ b/fdisks/fdisksgilabel.h
@@ -13,11 +13,6 @@
 extern int  sgi_change_sysid(struct fdisk_context *cxt, int i, int sys);
 extern unsigned int	sgi_get_start_sector(struct fdisk_context *cxt, int i );
 extern unsigned int	sgi_get_num_sectors(struct fdisk_context *cxt, int i );
-extern void	sgi_set_ilfact( void );
-extern void	sgi_set_rspeed( void );
-extern void	sgi_set_pcylcount( void );
-extern void	sgi_set_xcyl( void );
-extern void	sgi_set_ncyl( void );
 extern void	sgi_set_bootpartition(struct fdisk_context *cxt, int i );
 extern void	sgi_set_swappartition(struct fdisk_context *cxt, int i );
 extern int	sgi_get_bootpartition(struct fdisk_context *cxt);