[ide] kill ide_drive_t->suspend_reset

This cruft pre-dates benh's PowerManagement code.
Moreover ->suspend_reset is always equal to zero.
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent d5033980
...@@ -852,13 +852,6 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq) ...@@ -852,13 +852,6 @@ static ide_startstop_t start_request (ide_drive_t *drive, struct request *rq)
goto kill_rq; goto kill_rq;
} }
/*
* bail early if we've sent a device to sleep, however how to wake
* this needs to be a masked flag. FIXME for proper operations.
*/
if (drive->suspend_reset)
goto kill_rq;
block = rq->sector; block = rq->sector;
if (blk_fs_request(rq) && if (blk_fs_request(rq) &&
(drive->media == ide_disk || drive->media == ide_floppy)) { (drive->media == ide_disk || drive->media == ide_floppy)) {
......
...@@ -1554,18 +1554,7 @@ int generic_ide_ioctl(struct file *file, struct block_device *bdev, ...@@ -1554,18 +1554,7 @@ int generic_ide_ioctl(struct file *file, struct block_device *bdev,
HWGROUP(drive)->busy = 1; HWGROUP(drive)->busy = 1;
spin_unlock_irqrestore(&ide_lock, flags); spin_unlock_irqrestore(&ide_lock, flags);
(void) ide_do_reset(drive); (void) ide_do_reset(drive);
if (drive->suspend_reset) {
/*
* APM WAKE UP todo !!
* int nogoodpower = 1;
* while(nogoodpower) {
* check_power1() or check_power2()
* nogoodpower = 0;
* }
* HWIF(drive)->multiproc(drive);
*/
return ioctl_by_bdev(bdev, BLKRRPART, 0);
}
return 0; return 0;
} }
...@@ -2133,7 +2122,6 @@ int ide_register_subdriver(ide_drive_t *drive, ide_driver_t *driver) ...@@ -2133,7 +2122,6 @@ int ide_register_subdriver(ide_drive_t *drive, ide_driver_t *driver)
drive->dsc_overlap = (drive->next != drive && driver->supports_dsc_overlap); drive->dsc_overlap = (drive->next != drive && driver->supports_dsc_overlap);
drive->nice1 = 1; drive->nice1 = 1;
} }
drive->suspend_reset = 0;
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
if (drive->driver != &idedefault_driver) { if (drive->driver != &idedefault_driver) {
ide_add_proc_entries(drive->proc, generic_subdriver_entries, drive); ide_add_proc_entries(drive->proc, generic_subdriver_entries, drive);
......
...@@ -723,7 +723,6 @@ typedef struct ide_drive_s { ...@@ -723,7 +723,6 @@ typedef struct ide_drive_s {
unsigned scsi : 1; /* 0=default, 1=ide-scsi emulation */ unsigned scsi : 1; /* 0=default, 1=ide-scsi emulation */
u8 quirk_list; /* considered quirky, set for a specific host */ u8 quirk_list; /* considered quirky, set for a specific host */
u8 suspend_reset; /* drive suspend mode flag, soft-reset recovers */
u8 init_speed; /* transfer rate set at boot */ u8 init_speed; /* transfer rate set at boot */
u8 pio_speed; /* unused by core, used by some drivers for fallback from DMA */ u8 pio_speed; /* unused by core, used by some drivers for fallback from DMA */
u8 current_speed; /* current transfer rate set */ u8 current_speed; /* current transfer rate set */
......
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