diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@trik.(none)> | 2005-01-07 06:03:18 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@trik.(none)> | 2005-01-07 06:03:18 +0100 |
| commit | de9eb7ac1135d5cce597b26f813c7776a1b0fbcd (patch) | |
| tree | dfe8b257fc7845cdb0c1bcc66620c89fb9566ca7 /include/linux/ide.h | |
| parent | 2fb305404997c5880a789794e3a3ddb7174b1231 (diff) | |
[ide] rework ide_driver_t->error
* split __ide_error() out of ide_error()
* call driver->error() inside ide_error()
* convert all users of driver->error()
* fix default_cleanup() and idescsi_atapi_error()
* make idescsi_atapi_error() static
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/linux/ide.h')
| -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 bcb82ec01d55..ccf202f52c49 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1097,7 +1097,7 @@ typedef struct ide_driver_s { int (*cleanup)(ide_drive_t *); 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 *, const char *, u8); + ide_startstop_t (*error)(ide_drive_t *, struct request *rq, u8, u8); ide_startstop_t (*abort)(ide_drive_t *, const char *); int (*ioctl)(ide_drive_t *, struct inode *, struct file *, unsigned int, unsigned long); void (*pre_reset)(ide_drive_t *); @@ -1146,6 +1146,8 @@ extern void ide_set_handler (ide_drive_t *drive, ide_handler_t *handler, unsigne */ extern void ide_execute_command(ide_drive_t *, task_ioreg_t cmd, ide_handler_t *, unsigned int, ide_expiry_t *); +ide_startstop_t __ide_error(ide_drive_t *, struct request *, u8, u8); + /* * ide_error() takes action based on the error returned by the controller. * The caller should return immediately after invoking this. |