fdisk: (sgi) remove dead code

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

diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
index c6d89031e6c51869a61d07154091166fcfb9d4c4..0652cb31030be3476321d5ccf84952ab27c76274 100644 (file)
--- 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 ddeeca9966a2a907af23b8499571ce8568f456a8..1c51ee346ee653499d8ec7a38de588d7fedc2894 100644 (file)
--- 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 de333c13bfbd8e952596f64fbba0c6aa3c8fae5a..dfbd40f4dd2fca438ecc79fa8d1102c74b06ac0e 100644 (file)
--- 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);