diff options
| author | Martin Dalecki <dalecki@evision-ventures.com> | 2002-06-13 19:49:48 -0700 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@kleikamp.austin.ibm.com> | 2002-06-13 19:49:48 -0700 |
| commit | 3fb57bd690be04f8e19009c77f317717021ea15a (patch) | |
| tree | c599a4a98a93e263600e833c2ee6c8ee70aa8ccf /include | |
| parent | caede697c7157710af6fb14da376e05ab120659c (diff) | |
[PATCH] 2.5.21 IDE 90
- Implement the assertion that the lock is already held, if we run
ata_status_poll.
- The usual host chip code load from Bartomiej onierkiewicz. Fortunately
I'm able to check the sis5513 fixes on a life system.
More serious stuff... for IDE 88:
- implement ata_best_pio_mode() in ata-timing.c
(play safer than driver's config_chipset_for_pio())
- replace config_chipset_for_pio() by ata_best_pio_mode()
in host chips drivers
(trivial for hpt34x.c, hpt366.c and serverworks.c,
non-trivial for cmd64x.c and sis5513.c)
- set PIO also for (U)DMA modes in cmd64x_tune_chipset()
(cmd64x.c)
- fix bug in setting PIO0-2 for devices also supporting PIO3/4
(sis5513.c)
- misc cleanups
- Rename XXX_do_request back do do_request. This was just tmporary tagging.
- Move ata_taskfile() call down to the ide-disk request handler.c, which is the
only place needing it. Rename ata_taskfile to ata_do_taskfile(). This
allowed us to implement the assertion that ata_do_taskfile() will be only
called with the channel lock already held.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ide.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 47cbaea890a8..0f683d2ad94f 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -545,7 +545,7 @@ struct ata_operations { void (*attach) (struct ata_device *); int (*cleanup)(struct ata_device *); int (*standby)(struct ata_device *); - ide_startstop_t (*XXX_do_request)(struct ata_device *, struct request *, sector_t); + ide_startstop_t (*do_request)(struct ata_device *, struct request *, sector_t); int (*end_request)(struct ata_device *, struct request *, int); int (*ioctl)(struct ata_device *, struct inode *, struct file *, unsigned int, unsigned long); @@ -658,7 +658,7 @@ struct ata_taskfile { extern void ata_read(struct ata_device *, void *, unsigned int); extern void ata_write(struct ata_device *, void *, unsigned int); -extern ide_startstop_t ata_taskfile(struct ata_device *, +extern ide_startstop_t ata_do_taskfile(struct ata_device *, struct ata_taskfile *, struct request *); /* |