summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-probe.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz2008-02-02 19:56:40 +0100
committerBartlomiej Zolnierkiewicz2008-02-02 19:56:40 +0100
commit3a4e7c96d6bce25b102115c267c8ebfe13187925 (patch)
treec1e45b53cbbfea094c05838f72951786307d0a47 /drivers/ide/ide-probe.c
parentide: skip not present devices in init_gendisk() (diff)
downloadkernel-qcow2-linux-3a4e7c96d6bce25b102115c267c8ebfe13187925.tar.gz
kernel-qcow2-linux-3a4e7c96d6bce25b102115c267c8ebfe13187925.tar.xz
kernel-qcow2-linux-3a4e7c96d6bce25b102115c267c8ebfe13187925.zip
ide: move blk_register_region() call out from init_gendisk()
Move blk_register_region() call out from init_gendisk() to hwif_init(). There should be no functionality changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r--drivers/ide/ide-probe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 4d5291c33fab..74b024519aff 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1200,8 +1200,6 @@ static void init_gendisk (ide_hwif_t *hwif)
drive->gendev.driver_data = drive;
drive->gendev.release = drive_release_dev;
}
- blk_register_region(MKDEV(hwif->major, 0), MAX_DRIVES << PARTN_BITS,
- THIS_MODULE, ata_probe, ata_lock, hwif);
}
static int hwif_init(ide_hwif_t *hwif)
@@ -1261,6 +1259,8 @@ static int hwif_init(ide_hwif_t *hwif)
done:
init_gendisk(hwif);
+ blk_register_region(MKDEV(hwif->major, 0), MAX_DRIVES << PARTN_BITS,
+ THIS_MODULE, ata_probe, ata_lock, hwif);
ide_acpi_init(hwif);
return 1;