diff options
author | Tejun Heo <htejun@gmail.com> | 2008-03-25 09:16:44 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 15:44:18 -0400 |
commit | 6fd36390117f7844ad147377878ddb52088f583a (patch) | |
tree | c25d9a8357ff173ce46eb057cc50370b87b9cca8 /include | |
parent | 3d5a3d67a578d95ac3a11a862d16a054e2d4d9cd (diff) |
libata: kill ata_chk_status()
ata_chk_status() just calls ops->check_status and it only adds
confusion with other status functions. Kill it.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/libata.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 53b8db05a1fb..61a7f8d06971 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -1401,11 +1401,6 @@ extern int ata_pci_init_one(struct pci_dev *pdev, | |||
1401 | struct scsi_host_template *sht, void *host_priv); | 1401 | struct scsi_host_template *sht, void *host_priv); |
1402 | #endif /* CONFIG_PCI */ | 1402 | #endif /* CONFIG_PCI */ |
1403 | 1403 | ||
1404 | static inline u8 ata_chk_status(struct ata_port *ap) | ||
1405 | { | ||
1406 | return ap->ops->check_status(ap); | ||
1407 | } | ||
1408 | |||
1409 | /** | 1404 | /** |
1410 | * ata_pause - Flush writes and pause 400 nanoseconds. | 1405 | * ata_pause - Flush writes and pause 400 nanoseconds. |
1411 | * @ap: Port to wait for. | 1406 | * @ap: Port to wait for. |
@@ -1439,7 +1434,7 @@ static inline u8 ata_busy_wait(struct ata_port *ap, unsigned int bits, | |||
1439 | 1434 | ||
1440 | do { | 1435 | do { |
1441 | udelay(10); | 1436 | udelay(10); |
1442 | status = ata_chk_status(ap); | 1437 | status = ap->ops->check_status(ap); |
1443 | max--; | 1438 | max--; |
1444 | } while (status != 0xff && (status & bits) && (max > 0)); | 1439 | } while (status != 0xff && (status & bits) && (max > 0)); |
1445 | 1440 | ||