diff options
| author | Bartlomiej Zolnierkiewicz | 2008-10-10 22:39:27 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz | 2008-10-10 22:39:27 +0200 |
| commit | 1e874f448365b80e69b8a60b8b575b17f00811f3 (patch) | |
| tree | 6a79a12ffdcaa12f5f89356527c1ab02014c751b /drivers/ide/ide-cd.c | |
| parent | ide: include <linux/hdreg.h> only when needed (diff) | |
| download | kernel-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-cd.c')
| -rw-r--r-- | drivers/ide/ide-cd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 607af5de16f8..34a1aeaa15dd 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -1924,6 +1924,8 @@ static int ide_cdrom_setup(ide_drive_t *drive) cd->devinfo.handle = NULL; return 1; } + + ide_proc_register_driver(drive, cd->driver); ide_cdrom_add_settings(drive); return 0; } @@ -2134,8 +2136,6 @@ static int ide_cd_probe(ide_drive_t *drive) ide_init_disk(g, drive); - ide_proc_register_driver(drive, &ide_cdrom_driver); - kref_init(&info->kref); info->drive = drive; @@ -2150,7 +2150,6 @@ static int ide_cd_probe(ide_drive_t *drive) g->driverfs_dev = &drive->gendev; g->flags = GENHD_FL_CD | GENHD_FL_REMOVABLE; if (ide_cdrom_setup(drive)) { - ide_proc_unregister_driver(drive, &ide_cdrom_driver); ide_cd_release(&info->kref); goto failed; } |