diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@trik.(none)> | 2005-01-07 06:06:22 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@trik.(none)> | 2005-01-07 06:06:22 +0100 |
| commit | dec99512e81785a6f1b452f8c9554f9823c497e0 (patch) | |
| tree | 7a7cfca7419777cc8283fa2d61b6559ce9f62e4c /include | |
| parent | de9eb7ac1135d5cce597b26f813c7776a1b0fbcd (diff) | |
[ide] ide_driver_t->abort() cleanup
* add drive->media != ide_disk check to ide_abort()
* kill ide_cdrom_abort() and idedisk_abort()
* split __ide_abort() out of ide_abort()
* call driver->abort() inside ide_abort()
* convert the only user of driver->abort()
* fix default_abort() and idescsi_atapi_abort()
* make idescsi_atapi_abort() static
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ide.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index ccf202f52c49..df444c08d1ab 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1098,7 +1098,7 @@ typedef struct ide_driver_s { ide_startstop_t (*do_request)(ide_drive_t *, struct request *, sector_t); int (*end_request)(ide_drive_t *, int, int); ide_startstop_t (*error)(ide_drive_t *, struct request *rq, u8, u8); - ide_startstop_t (*abort)(ide_drive_t *, const char *); + ide_startstop_t (*abort)(ide_drive_t *, struct request *rq); int (*ioctl)(ide_drive_t *, struct inode *, struct file *, unsigned int, unsigned long); void (*pre_reset)(ide_drive_t *); sector_t (*capacity)(ide_drive_t *); @@ -1156,6 +1156,8 @@ ide_startstop_t __ide_error(ide_drive_t *, struct request *, u8, u8); */ ide_startstop_t ide_error (ide_drive_t *drive, const char *msg, byte stat); +ide_startstop_t __ide_abort(ide_drive_t *, struct request *); + /* * Abort a running command on the controller triggering the abort * from a host side, non error situation |