2 files changed, 7 insertions, 16 deletions

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index a072df5053ae..29c8ae752683 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -41,16 +41,12 @@
 #include <asm/io.h>
 #include <asm/div64.h>
 
-#define IDE_DISK_PARTS          (1 << PARTN_BITS)
-
 #if !defined(CONFIG_DEBUG_BLOCK_EXT_DEVT)
-#define IDE_DISK_MINORS         IDE_DISK_PARTS
+#define IDE_DISK_MINORS         (1 << PARTN_BITS)
 #else
 #define IDE_DISK_MINORS         1
 #endif
 
-#define IDE_DISK_EXT_MINORS     (IDE_DISK_PARTS - IDE_DISK_MINORS)
-
 struct ide_disk_obj {
         ide_drive_t     *drive;
         ide_driver_t    *driver;
@@ -1161,8 +1157,7 @@ static int ide_disk_probe(ide_drive_t *drive)
         if (!idkp)
                 goto failed;
 
-        g = alloc_disk_ext_node(IDE_DISK_MINORS, IDE_DISK_EXT_MINORS,
-                                hwif_to_node(drive->hwif));
+        g = alloc_disk_node(IDE_DISK_MINORS, hwif_to_node(drive->hwif));
         if (!g)
                 goto out_free_idkp;
 
@@ -1189,9 +1184,10 @@ static int ide_disk_probe(ide_drive_t *drive)
                 drive->attach = 1;
 
         g->minors = IDE_DISK_MINORS;
-        g->ext_minors = IDE_DISK_EXT_MINORS;
         g->driverfs_dev = &drive->gendev;
-        g->flags = drive->removable ? GENHD_FL_REMOVABLE : 0;
+        g->flags |= GENHD_FL_EXT_DEVT;
+        if (drive->removable)
+                g->flags |= GENHD_FL_REMOVABLE;
         set_capacity(g, idedisk_capacity(drive));
         g->fops = &idedisk_ops;
         add_disk(g);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 280d231a86ed..6598024531dd 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -86,16 +86,12 @@ MODULE_ALIAS_SCSI_DEVICE(TYPE_DISK);
 MODULE_ALIAS_SCSI_DEVICE(TYPE_MOD);
 MODULE_ALIAS_SCSI_DEVICE(TYPE_RBC);
 
-#define SD_PARTS        64
-
 #if !defined(CONFIG_DEBUG_BLOCK_EXT_DEVT)
 #define SD_MINORS       16
 #else
 #define SD_MINORS       1
 #endif
 
-#define SD_EXT_MINORS   (SD_PARTS - SD_MINORS)
-
 static int  sd_revalidate_disk(struct gendisk *);
 static int  sd_probe(struct device *);
 static int  sd_remove(struct device *);
@@ -1811,7 +1807,7 @@ static int sd_probe(struct device *dev)
         if (!sdkp)
                 goto out;
 
-        gd = alloc_disk_ext(SD_MINORS, SD_EXT_MINORS);
+        gd = alloc_disk(SD_MINORS);
         if (!gd)
                 goto out_free;
 
@@ -1856,7 +1852,6 @@ static int sd_probe(struct device *dev)
         gd->major = sd_major((index & 0xf0) >> 4);
         gd->first_minor = ((index & 0xf) << 4) | (index & 0xfff00);
         gd->minors = SD_MINORS;
-        gd->ext_minors = SD_EXT_MINORS;
         gd->fops = &sd_fops;
 
         if (index < 26) {
@@ -1880,7 +1875,7 @@ static int sd_probe(struct device *dev)
         blk_queue_prep_rq(sdp->request_queue, sd_prep_fn);
 
         gd->driverfs_dev = &sdp->sdev_gendev;
-        gd->flags = GENHD_FL_DRIVERFS;
+        gd->flags = GENHD_FL_EXT_DEVT | GENHD_FL_DRIVERFS;
         if (sdp->removable)
                 gd->flags |= GENHD_FL_REMOVABLE;