diff options
| author | Bartlomiej Zolnierkiewicz | 2009-03-24 23:22:47 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz | 2009-03-24 23:22:47 +0100 |
| commit | 327fa1c29466b8fe471a91fc11e9c6171163c81a (patch) | |
| tree | 9dbbf65c886d5ec68299d563da0cd7df8b97c324 /include/linux/ide.h | |
| parent | ide: checkpatch.pl fixes for ide-iops.c (diff) | |
| download | kernel-qcow2-linux-327fa1c29466b8fe471a91fc11e9c6171163c81a.tar.gz kernel-qcow2-linux-327fa1c29466b8fe471a91fc11e9c6171163c81a.tar.xz kernel-qcow2-linux-327fa1c29466b8fe471a91fc11e9c6171163c81a.zip | |
ide: move error handling code to ide-eh.c (v2)
Do some CodingStyle fixups in <linux/ide.h> while at it.
v2:
Add missing <linux/delay.h> include (reported by Stephen Rothwell).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/linux/ide.h')
| -rw-r--r-- | include/linux/ide.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 323c3710fbf4..0c87ed52a875 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1146,11 +1146,14 @@ int generic_ide_ioctl(ide_drive_t *, struct block_device *, unsigned, unsigned l extern int ide_vlb_clk; extern int ide_pci_clk; -extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs); -int ide_end_dequeued_request(ide_drive_t *drive, struct request *rq, - int uptodate, int nr_sectors); - -extern void ide_set_handler (ide_drive_t *drive, ide_handler_t *handler, unsigned int timeout, ide_expiry_t *expiry); +int ide_end_request(ide_drive_t *, int, int); +int ide_end_dequeued_request(ide_drive_t *, struct request *, int, int); +void ide_kill_rq(ide_drive_t *, struct request *); + +void __ide_set_handler(ide_drive_t *, ide_handler_t *, unsigned int, + ide_expiry_t *); +void ide_set_handler(ide_drive_t *, ide_handler_t *, unsigned int, + ide_expiry_t *); void ide_execute_command(ide_drive_t *, u8, ide_handler_t *, unsigned int, ide_expiry_t *); |