diff options
author | Tejun Heo <tj@kernel.org> | 2010-05-10 15:41:38 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2010-05-19 13:35:49 -0400 |
commit | c429137a67b82788d24682153bb9c96501a9ef34 (patch) | |
tree | b24ed75908f08cc9cddb19efc74fcb46be75de8f /drivers/ata/libata.h | |
parent | 5fe7454aa9c6ef5fcf506b0f2dfc20f696891f1a (diff) |
libata-sff: port_task is SFF specific
port_task is tightly bound to the standard SFF PIO HSM implementation.
Using it for any other purpose would be error-prone and there's no
such user and if some drivers need such feature, it would be much
better off using its own. Move it inside CONFIG_ATA_SFF and rename it
to sff_pio_task.
The only function which is exposed to the core layer is
ata_sff_flush_pio_task() which is renamed from ata_port_flush_task()
and now also takes care of resetting hsm_task_state to HSM_ST_IDLE,
which is possible as it's now specific to PIO HSM.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/libata.h')
-rw-r--r-- | drivers/ata/libata.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h index d89502f3123..002390cdc04 100644 --- a/drivers/ata/libata.h +++ b/drivers/ata/libata.h | |||
@@ -79,7 +79,6 @@ extern int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev, | |||
79 | u64 block, u32 n_block, unsigned int tf_flags, | 79 | u64 block, u32 n_block, unsigned int tf_flags, |
80 | unsigned int tag); | 80 | unsigned int tag); |
81 | extern u64 ata_tf_read_block(struct ata_taskfile *tf, struct ata_device *dev); | 81 | extern u64 ata_tf_read_block(struct ata_taskfile *tf, struct ata_device *dev); |
82 | extern void ata_port_flush_task(struct ata_port *ap); | ||
83 | extern unsigned ata_exec_internal(struct ata_device *dev, | 82 | extern unsigned ata_exec_internal(struct ata_device *dev, |
84 | struct ata_taskfile *tf, const u8 *cdb, | 83 | struct ata_taskfile *tf, const u8 *cdb, |
85 | int dma_dir, void *buf, unsigned int buflen, | 84 | int dma_dir, void *buf, unsigned int buflen, |
@@ -202,11 +201,13 @@ static inline int sata_pmp_attach(struct ata_device *dev) | |||
202 | 201 | ||
203 | /* libata-sff.c */ | 202 | /* libata-sff.c */ |
204 | #ifdef CONFIG_ATA_SFF | 203 | #ifdef CONFIG_ATA_SFF |
205 | extern void ata_pio_task(struct work_struct *work); | 204 | extern void ata_sff_flush_pio_task(struct ata_port *ap); |
206 | extern void ata_sff_port_init(struct ata_port *ap); | 205 | extern void ata_sff_port_init(struct ata_port *ap); |
207 | extern int ata_sff_init(void); | 206 | extern int ata_sff_init(void); |
208 | extern void ata_sff_exit(void); | 207 | extern void ata_sff_exit(void); |
209 | #else /* CONFIG_ATA_SFF */ | 208 | #else /* CONFIG_ATA_SFF */ |
209 | static inline void ata_sff_flush_pio_task(struct ata_port *ap) | ||
210 | { } | ||
210 | static inline void ata_sff_port_init(struct ata_port *ap) | 211 | static inline void ata_sff_port_init(struct ata_port *ap) |
211 | { } | 212 | { } |
212 | static inline int ata_sff_init(void) | 213 | static inline int ata_sff_init(void) |