diff options
author | Tejun Heo <htejun@gmail.com> | 2008-03-25 09:16:41 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 15:44:18 -0400 |
commit | 624d5c514eed18d5a93062e9d86d67065175f30a (patch) | |
tree | 61f89b05b70e9b443cf09083b4ae3d102dd357b7 /drivers/ata/libata.h | |
parent | 272f7884e8c0effe594e5537092b9c0ccc0140b0 (diff) |
libata: reorganize SFF related stuff
* Move SFF related functions from libata-core.c to libata-sff.c.
ata_[bmdma_]sff_port_ops, ata_devchk(), ata_dev_try_classify(),
ata_std_dev_select(), ata_tf_to_host(), ata_busy_sleep(),
ata_wait_after_reset(), ata_wait_ready(), ata_bus_post_reset(),
ata_bus_softreset(), ata_bus_reset(), ata_std_softreset(),
sata_std_hardreset(), ata_fill_sg(), ata_fill_sg_dumb(),
ata_qc_prep(), ata_dump_qc_prep(), ata_data_xfer(),
ata_data_xfer_noirq(), ata_pio_sector(), ata_pio_sectors(),
atapi_send_cdb(), __atapi_pio_bytes(), atapi_pio_bytes(),
ata_hsm_ok_in_wq(), ata_hsm_qc_complete(), ata_hsm_move(),
ata_pio_task(), ata_qc_issue_prot(), ata_host_intr(),
ata_interrupt(), ata_std_ports()
* Make ata_pio_queue_task() global as it's now called from
libata-sff.c.
* Move SFF related stuff in include/linux/libata.h and
drivers/ata/libata.h into one place. While at it, move timing
constants into the global enum definition and fortify comments a
bit.
This patch strictly moves stuff around and as such doesn't cause any
functional difference.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/libata.h')
-rw-r--r-- | drivers/ata/libata.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h index aa884f71a12a..a69f663c7402 100644 --- a/drivers/ata/libata.h +++ b/drivers/ata/libata.h | |||
@@ -67,6 +67,8 @@ extern int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev, | |||
67 | unsigned int tag); | 67 | unsigned int tag); |
68 | extern u64 ata_tf_read_block(struct ata_taskfile *tf, struct ata_device *dev); | 68 | extern u64 ata_tf_read_block(struct ata_taskfile *tf, struct ata_device *dev); |
69 | extern void ata_dev_disable(struct ata_device *dev); | 69 | extern void ata_dev_disable(struct ata_device *dev); |
70 | extern void ata_pio_queue_task(struct ata_port *ap, void *data, | ||
71 | unsigned long delay); | ||
70 | extern void ata_port_flush_task(struct ata_port *ap); | 72 | extern void ata_port_flush_task(struct ata_port *ap); |
71 | extern unsigned ata_exec_internal(struct ata_device *dev, | 73 | extern unsigned ata_exec_internal(struct ata_device *dev, |
72 | struct ata_taskfile *tf, const u8 *cdb, | 74 | struct ata_taskfile *tf, const u8 *cdb, |
@@ -91,8 +93,6 @@ extern void ata_qc_free(struct ata_queued_cmd *qc); | |||
91 | extern void ata_qc_issue(struct ata_queued_cmd *qc); | 93 | extern void ata_qc_issue(struct ata_queued_cmd *qc); |
92 | extern void __ata_qc_complete(struct ata_queued_cmd *qc); | 94 | extern void __ata_qc_complete(struct ata_queued_cmd *qc); |
93 | extern int ata_check_atapi_dma(struct ata_queued_cmd *qc); | 95 | extern int ata_check_atapi_dma(struct ata_queued_cmd *qc); |
94 | extern void ata_dev_select(struct ata_port *ap, unsigned int device, | ||
95 | unsigned int wait, unsigned int can_sleep); | ||
96 | extern void swap_buf_le16(u16 *buf, unsigned int buf_words); | 96 | extern void swap_buf_le16(u16 *buf, unsigned int buf_words); |
97 | extern int ata_flush_cache(struct ata_device *dev); | 97 | extern int ata_flush_cache(struct ata_device *dev); |
98 | extern void ata_dev_init(struct ata_device *dev); | 98 | extern void ata_dev_init(struct ata_device *dev); |
@@ -194,7 +194,9 @@ extern int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, | |||
194 | extern void ata_eh_finish(struct ata_port *ap); | 194 | extern void ata_eh_finish(struct ata_port *ap); |
195 | 195 | ||
196 | /* libata-sff.c */ | 196 | /* libata-sff.c */ |
197 | extern void ata_dev_select(struct ata_port *ap, unsigned int device, | ||
198 | unsigned int wait, unsigned int can_sleep); | ||
197 | extern u8 ata_irq_on(struct ata_port *ap); | 199 | extern u8 ata_irq_on(struct ata_port *ap); |
198 | 200 | extern void ata_pio_task(struct work_struct *work); | |
199 | 201 | ||
200 | #endif /* __LIBATA_H__ */ | 202 | #endif /* __LIBATA_H__ */ |