summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-floppy.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz2008-10-10 22:39:27 +0200
committerBartlomiej Zolnierkiewicz2008-10-10 22:39:27 +0200
commit1e874f448365b80e69b8a60b8b575b17f00811f3 (patch)
tree6a79a12ffdcaa12f5f89356527c1ab02014c751b /drivers/ide/ide-floppy.c
parentide: include <linux/hdreg.h> only when needed (diff)
downloadkernel-qcow2-linux-1e874f448365b80e69b8a60b8b575b17f00811f3.tar.gz
kernel-qcow2-linux-1e874f448365b80e69b8a60b8b575b17f00811f3.tar.xz
kernel-qcow2-linux-1e874f448365b80e69b8a60b8b575b17f00811f3.zip
ide: call ide_proc_register_driver() later
Call ide_proc_register_driver() in ide*_setup() (just before ide*_add_settings() call) instead of in ->probe method. Despite being basically a preparation for /proc/ide/hd*/settings rework this is a nice cleanup in itself. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-floppy.c')
-rw-r--r--drivers/ide/ide-floppy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index b0f4d8459a9d..597459c81d5f 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -1061,6 +1061,8 @@ static void idefloppy_setup(ide_drive_t *drive, idefloppy_floppy_t *floppy)
}
(void) ide_floppy_get_capacity(drive);
+
+ ide_proc_register_driver(drive, floppy->driver);
idefloppy_add_settings(drive);
}
@@ -1413,8 +1415,6 @@ static int ide_floppy_probe(ide_drive_t *drive)
ide_init_disk(g, drive);
- ide_proc_register_driver(drive, &idefloppy_driver);
-
kref_init(&floppy->kref);
floppy->drive = drive;