diff options
| author | Martin Dalecki <dalecki@evision-ventures.com> | 2002-06-10 19:46:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-10 19:46:27 -0700 |
| commit | d861eb67099fc68e30ce367948378723dbcea0c1 (patch) | |
| tree | e981b0cc4066bc20c8d5d590219688f104bcab7c /include | |
| parent | 96ba040a2c0123e6913e869cc97a46356e67e8e6 (diff) | |
[PATCH] 2.5.21 IDE 87
- Sync with 2.5.21
- Don't call put_device inside idedisk_cleanup(). This is apparently triggering
some bug inside the handling of device trees. Or we don't register the device
properly within the tree. Check this later.
- Further work on the channel register file access locking. Push the locking
out from __ide_end_request to ide_end_request. Rename those functions to
respective __ata_end_request() and ata_end_request().
- Move ide_wait_status to device.c rename it to ata_status_poll().
- Further work on locking scope issues.
- devfs showed us once again that it changed the policy from agnostic numbers
to unpleasant string names.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ide.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 9ef57489ae9c..19a536541906 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -601,8 +601,9 @@ extern int noautodma; #define LOCAL_END_REQUEST /* Don't generate end_request in blk.h */ #include <linux/blk.h> -extern int __ide_end_request(struct ata_device *, struct request *, int, unsigned int); -extern int ide_end_request(struct ata_device *drive, struct request *, int); +/* Not locking and locking variant: */ +extern int __ata_end_request(struct ata_device *, struct request *, int, unsigned int); +extern int ata_end_request(struct ata_device *drive, struct request *, int); extern void ata_set_handler(struct ata_device *drive, ata_handler_t handler, unsigned long timeout, ata_expiry_t expiry); @@ -611,11 +612,6 @@ extern u8 ata_dump(struct ata_device *, struct request *, const char *); extern ide_startstop_t ata_error(struct ata_device *, struct request *rq, const char *); extern void ide_fixstring(char *s, const int bytecount, const int byteswap); - -extern int ide_wait_stat(ide_startstop_t *, - struct ata_device *, struct request *rq, - byte, byte, unsigned long); - extern int ide_wait_noerr(struct ata_device *, byte, byte, unsigned long); /* @@ -831,7 +827,11 @@ extern int drive_is_ready(struct ata_device *drive); extern void ata_select(struct ata_device *, unsigned long); extern void ata_mask(struct ata_device *); +extern int ata_busy_poll(struct ata_device *, unsigned long); extern int ata_status(struct ata_device *, u8, u8); +extern int ata_status_poll( struct ata_device *, u8, u8, + unsigned long, struct request *rq, ide_startstop_t *); + extern int ata_irq_enable(struct ata_device *, int); extern void ata_reset(struct ata_channel *); extern void ata_out_regfile(struct ata_device *, struct hd_drive_task_hdr *); |