diff options
| author | Martin Dalecki <dalecki@evision-ventures.com> | 2002-06-02 20:52:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-02 20:52:31 -0700 |
| commit | 7723316a83dd8076af3d3b4222d972f295a9218f (patch) | |
| tree | 67fbc741272eaa48d44dc44084754ff4784e60f0 /include/linux | |
| parent | 037de95a69a9bffca8593f0b61f32f860a46eb97 (diff) | |
[PATCH] ]PATCH] 2.5.20 IDE 83
- Remove last parameter from ide_dump_status. This information is now
permanently present in device->staus field, so there is not need to pass it
around.
- Patch for DVD read through ide-scsi. There is the possibility that we can get
request structures passed down, which don't have the queue field set.
At lest on the BIO code path this seems to be something worth further
investigation. Found by Adam J. Richter. (Jens?)
- Revert my change to the hostdata handling. I did get it wrong about the way
host structures are allocated by the generic SCSI layer. It plays
tricks there.
- piix driver updates by Vojtech Pavlik.
- We have a ata_out_regfile, so we should have ata_in_regfile too.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ide.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 24f5ce47a19d..b1c154c22228 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -610,11 +610,7 @@ extern int ide_end_request(struct ata_device *drive, struct request *, int); extern void ide_set_handler(struct ata_device *drive, ata_handler_t handler, unsigned long timeout, ata_expiry_t expiry); -/* - * Error reporting, in human readable form (luxurious, but a memory hog). - */ -extern u8 ide_dump_status(struct ata_device *, struct request *rq, const char *, u8); - +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); @@ -799,7 +795,7 @@ extern void udma_pci_timeout(struct ata_device *drive); extern void udma_pci_irq_lost(struct ata_device *); extern int udma_pci_setup(struct ata_device *); -extern int udma_new_table(struct ata_channel *, struct request *); +extern int udma_new_table(struct ata_device *, struct request *); extern void udma_destroy_table(struct ata_channel *); extern void udma_print(struct ata_device *); @@ -834,5 +830,6 @@ extern int ata_status(struct ata_device *, u8, u8); 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 *); +extern void ata_in_regfile(struct ata_device *, struct hd_drive_task_hdr *); #endif |