From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Thu, 25 Feb 2016 19:29:30 +0000 (+0100)
Subject: libfdisk: remove ifdef HDIO_GETGEO
X-Git-Tag: v2.28-rc1~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9851e63fba82cbda2238f26f20bf59b3d962577;p=thirdparty%2Futil-linux.git

libfdisk: remove ifdef HDIO_GETGEO

We don't use HDIO_GETGEO since e5b5a349.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---

diff --git a/libfdisk/src/sgi.c b/libfdisk/src/sgi.c
index 6228cf87db..c77724aa21 100644
--- a/libfdisk/src/sgi.c
+++ b/libfdisk/src/sgi.c
@@ -968,7 +968,6 @@ static int sgi_create_disklabel(struct fdisk_context *cxt)
 	assert(cxt->label);
 	assert(fdisk_is_label(cxt, SGI));
 
-#ifdef HDIO_GETGEO
 	if (cxt->geom.heads && cxt->geom.sectors) {
 		fdisk_sector_t llsectors;
 
@@ -990,7 +989,7 @@ static int sgi_create_disklabel(struct fdisk_context *cxt)
 				  "> 33.8 GB."), cxt->dev_path, cxt->geom.cylinders);
 		}
 	}
-#endif
+
 	rc = fdisk_init_firstsector_buffer(cxt, 0, 0);
 	if (rc)
 		return rc;
diff --git a/libfdisk/src/sun.c b/libfdisk/src/sun.c
index a50076a87f..a97ecac0a0 100644
--- a/libfdisk/src/sun.c
+++ b/libfdisk/src/sun.c
@@ -225,7 +225,6 @@ static int sun_create_disklabel(struct fdisk_context *cxt)
 	sunlabel->vtoc.sanity = cpu_to_be32(SUN_VTOC_SANITY);
 	sunlabel->vtoc.nparts = cpu_to_be16(SUN_MAXPARTITIONS);
 
-#ifdef HDIO_GETGEO
 	if (cxt->geom.heads && cxt->geom.sectors) {
 		fdisk_sector_t llsectors;
 
@@ -246,7 +245,6 @@ static int sun_create_disklabel(struct fdisk_context *cxt)
 				cxt->dev_path, cxt->geom.cylinders);
 		}
 	} else
-#endif
 		ask_geom(cxt);
 
 	sunlabel->acyl   = cpu_to_be16(0);