aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/libata.h
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2008-04-07 09:47:16 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-17 15:44:22 -0400
commit5682ed33aae05d10a25c95633ef9d9c062825888 (patch)
tree1632d4d70f4fd2dc25596a5cde1183f70f162ac3 /include/linux/libata.h
parent9363c3825ea9ad76561eb48a395349dd29211ed6 (diff)
libata: rename SFF port ops
Add sff_ prefix to SFF specific port ops. This rename is in preparation of separating SFF support out of libata core layer. This patch strictly renames ops and doesn't introduce any behavior difference. Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'include/linux/libata.h')
-rw-r--r--include/linux/libata.h25
1 files changed, 13 insertions, 12 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 66663bfe2c71..584eca19b8f1 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -743,17 +743,18 @@ struct ata_port_operations {
743 /* 743 /*
744 * SFF / taskfile oriented ops 744 * SFF / taskfile oriented ops
745 */ 745 */
746 void (*dev_select)(struct ata_port *ap, unsigned int device); 746 void (*sff_dev_select)(struct ata_port *ap, unsigned int device);
747 u8 (*check_status)(struct ata_port *ap); 747 u8 (*sff_check_status)(struct ata_port *ap);
748 u8 (*check_altstatus)(struct ata_port *ap); 748 u8 (*sff_check_altstatus)(struct ata_port *ap);
749 void (*tf_load)(struct ata_port *ap, const struct ata_taskfile *tf); 749 void (*sff_tf_load)(struct ata_port *ap, const struct ata_taskfile *tf);
750 void (*tf_read)(struct ata_port *ap, struct ata_taskfile *tf); 750 void (*sff_tf_read)(struct ata_port *ap, struct ata_taskfile *tf);
751 void (*exec_command)(struct ata_port *ap, const struct ata_taskfile *tf); 751 void (*sff_exec_command)(struct ata_port *ap,
752 unsigned int (*data_xfer)(struct ata_device *dev, unsigned char *buf, 752 const struct ata_taskfile *tf);
753 unsigned int buflen, int rw); 753 unsigned int (*sff_data_xfer)(struct ata_device *dev,
754 u8 (*irq_on)(struct ata_port *); 754 unsigned char *buf, unsigned int buflen, int rw);
755 755 u8 (*sff_irq_on)(struct ata_port *);
756 void (*irq_clear)(struct ata_port *); 756 void (*sff_irq_clear)(struct ata_port *);
757
757 void (*bmdma_setup)(struct ata_queued_cmd *qc); 758 void (*bmdma_setup)(struct ata_queued_cmd *qc);
758 void (*bmdma_start)(struct ata_queued_cmd *qc); 759 void (*bmdma_start)(struct ata_queued_cmd *qc);
759 void (*bmdma_stop)(struct ata_queued_cmd *qc); 760 void (*bmdma_stop)(struct ata_queued_cmd *qc);
@@ -1438,7 +1439,7 @@ static inline u8 ata_sff_busy_wait(struct ata_port *ap, unsigned int bits,
1438 1439
1439 do { 1440 do {
1440 udelay(10); 1441 udelay(10);
1441 status = ap->ops->check_status(ap); 1442 status = ap->ops->sff_check_status(ap);
1442 max--; 1443 max--;
1443 } while (status != 0xff && (status & bits) && (max > 0)); 1444 } while (status != 0xff && (status & bits) && (max > 0));
1444 1445