Commit 10e01163 authored by Patrick Mochel's avatar Patrick Mochel

driver model (scsi): change calls of remove_driver() to driver_unregister().

parent 16733e6a
...@@ -861,8 +861,7 @@ static int scsi_debug_release(struct Scsi_Host * hpnt) ...@@ -861,8 +861,7 @@ static int scsi_debug_release(struct Scsi_Host * hpnt)
if (++num_releases == num_present) { if (++num_releases == num_present) {
#ifdef DRIVERFS_SUPPORT #ifdef DRIVERFS_SUPPORT
do_remove_driverfs_files(); do_remove_driverfs_files();
remove_driver(&sdebug_driverfs_driver); driver_unregister(&sdebug_driverfs_driver);
// driver_unregister(&sdebug_driverfs_driver);
#endif #endif
vfree(fake_storep); vfree(fake_storep);
vfree(devInfop); vfree(devInfop);
......
...@@ -1549,7 +1549,7 @@ static void __exit exit_sd(void) ...@@ -1549,7 +1549,7 @@ static void __exit exit_sd(void)
for (k = 0; k < N_USED_SD_MAJORS; k++) for (k = 0; k < N_USED_SD_MAJORS; k++)
blk_dev[SD_MAJOR(k)].queue = NULL; blk_dev[SD_MAJOR(k)].queue = NULL;
sd_template.dev_max = 0; sd_template.dev_max = 0;
remove_driver(&sd_template.scsi_driverfs_driver); driver_unregister(&sd_template.scsi_driverfs_driver);
unregister_reboot_notifier(&sd_notifier_block); unregister_reboot_notifier(&sd_notifier_block);
} }
......
...@@ -1659,7 +1659,7 @@ exit_sg(void) ...@@ -1659,7 +1659,7 @@ exit_sg(void)
sg_dev_arr = NULL; sg_dev_arr = NULL;
} }
sg_template.dev_max = 0; sg_template.dev_max = 0;
remove_driver(&sg_template.scsi_driverfs_driver); driver_unregister(&sg_template.scsi_driverfs_driver);
} }
static int static int
......
...@@ -839,7 +839,7 @@ static void __exit exit_sr(void) ...@@ -839,7 +839,7 @@ static void __exit exit_sr(void)
kfree(scsi_CDs); kfree(scsi_CDs);
sr_template.dev_max = 0; sr_template.dev_max = 0;
remove_driver(&sr_template.scsi_driverfs_driver); driver_unregister(&sr_template.scsi_driverfs_driver);
} }
module_init(init_sr); module_init(init_sr);
......
...@@ -3994,7 +3994,7 @@ static void __exit exit_st(void) ...@@ -3994,7 +3994,7 @@ static void __exit exit_st(void)
kfree(scsi_tapes); kfree(scsi_tapes);
} }
st_template.dev_max = 0; st_template.dev_max = 0;
remove_driver(&st_template.scsi_driverfs_driver); driver_unregister(&st_template.scsi_driverfs_driver);
printk(KERN_INFO "st: Unloaded.\n"); printk(KERN_INFO "st: Unloaded.\n");
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment