[ide] kill default_{attach,cleanup}()

Device drivers are supposed to provide their own ->attach and ->cleanup.
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 85c51989
...@@ -46,6 +46,7 @@ ide_driver_t idedefault_driver = { ...@@ -46,6 +46,7 @@ ide_driver_t idedefault_driver = {
.name = "ide-default", .name = "ide-default",
.version = IDEDEFAULT_VERSION, .version = IDEDEFAULT_VERSION,
.attach = idedefault_attach, .attach = idedefault_attach,
.cleanup = ide_unregister_subdriver,
.drives = LIST_HEAD_INIT(idedefault_driver.drives) .drives = LIST_HEAD_INIT(idedefault_driver.drives)
}; };
......
...@@ -2018,16 +2018,6 @@ static void __init probe_for_hwifs (void) ...@@ -2018,16 +2018,6 @@ static void __init probe_for_hwifs (void)
#endif #endif
} }
/*
* Actually unregister the subdriver. Called with the
* request lock dropped.
*/
static int default_cleanup (ide_drive_t *drive)
{
return ide_unregister_subdriver(drive);
}
static ide_startstop_t default_do_request (ide_drive_t *drive, struct request *rq, sector_t block) static ide_startstop_t default_do_request (ide_drive_t *drive, struct request *rq, sector_t block)
{ {
ide_end_request(drive, 0, 0); ide_end_request(drive, 0, 0);
...@@ -2063,14 +2053,6 @@ static ide_startstop_t default_special (ide_drive_t *drive) ...@@ -2063,14 +2053,6 @@ static ide_startstop_t default_special (ide_drive_t *drive)
return ide_stopped; return ide_stopped;
} }
static int default_attach (ide_drive_t *drive)
{
printk(KERN_ERR "%s: does not support hotswap of device class !\n",
drive->name);
return 0;
}
static ide_startstop_t default_abort(ide_drive_t *drive, struct request *rq) static ide_startstop_t default_abort(ide_drive_t *drive, struct request *rq)
{ {
return __ide_abort(drive, rq); return __ide_abort(drive, rq);
...@@ -2085,7 +2067,8 @@ static ide_startstop_t default_start_power_step(ide_drive_t *drive, ...@@ -2085,7 +2067,8 @@ static ide_startstop_t default_start_power_step(ide_drive_t *drive,
static void setup_driver_defaults (ide_driver_t *d) static void setup_driver_defaults (ide_driver_t *d)
{ {
if (d->cleanup == NULL) d->cleanup = default_cleanup; BUG_ON(d->attach == NULL || d->cleanup == NULL);
if (d->do_request == NULL) d->do_request = default_do_request; if (d->do_request == NULL) d->do_request = default_do_request;
if (d->end_request == NULL) d->end_request = default_end_request; if (d->end_request == NULL) d->end_request = default_end_request;
if (d->error == NULL) d->error = default_error; if (d->error == NULL) d->error = default_error;
...@@ -2093,7 +2076,6 @@ static void setup_driver_defaults (ide_driver_t *d) ...@@ -2093,7 +2076,6 @@ static void setup_driver_defaults (ide_driver_t *d)
if (d->pre_reset == NULL) d->pre_reset = default_pre_reset; if (d->pre_reset == NULL) d->pre_reset = default_pre_reset;
if (d->capacity == NULL) d->capacity = default_capacity; if (d->capacity == NULL) d->capacity = default_capacity;
if (d->special == NULL) d->special = default_special; if (d->special == NULL) d->special = default_special;
if (d->attach == NULL) d->attach = default_attach;
if (d->start_power_step == NULL) if (d->start_power_step == NULL)
d->start_power_step = default_start_power_step; d->start_power_step = default_start_power_step;
} }
......
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