aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/libata-core.c9
-rw-r--r--include/linux/libata.h3
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 71de697e2327..4336fc889acd 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -61,9 +61,6 @@
61 61
62#include "libata.h" 62#include "libata.h"
63 63
64static unsigned int ata_busy_sleep (struct ata_port *ap,
65 unsigned long tmout_pat,
66 unsigned long tmout);
67static void ata_dev_reread_id(struct ata_port *ap, struct ata_device *dev); 64static void ata_dev_reread_id(struct ata_port *ap, struct ata_device *dev);
68static void ata_dev_init_params(struct ata_port *ap, struct ata_device *dev); 65static void ata_dev_init_params(struct ata_port *ap, struct ata_device *dev);
69static void ata_set_mode(struct ata_port *ap); 66static void ata_set_mode(struct ata_port *ap);
@@ -1960,9 +1957,8 @@ err_out:
1960 * 1957 *
1961 */ 1958 */
1962 1959
1963static unsigned int ata_busy_sleep (struct ata_port *ap, 1960unsigned int ata_busy_sleep (struct ata_port *ap,
1964 unsigned long tmout_pat, 1961 unsigned long tmout_pat, unsigned long tmout)
1965 unsigned long tmout)
1966{ 1962{
1967 unsigned long timer_start, timeout; 1963 unsigned long timer_start, timeout;
1968 u8 status; 1964 u8 status;
@@ -5167,6 +5163,7 @@ EXPORT_SYMBOL_GPL(__sata_phy_reset);
5167EXPORT_SYMBOL_GPL(ata_bus_reset); 5163EXPORT_SYMBOL_GPL(ata_bus_reset);
5168EXPORT_SYMBOL_GPL(ata_port_disable); 5164EXPORT_SYMBOL_GPL(ata_port_disable);
5169EXPORT_SYMBOL_GPL(ata_ratelimit); 5165EXPORT_SYMBOL_GPL(ata_ratelimit);
5166EXPORT_SYMBOL_GPL(ata_busy_sleep);
5170EXPORT_SYMBOL_GPL(ata_scsi_ioctl); 5167EXPORT_SYMBOL_GPL(ata_scsi_ioctl);
5171EXPORT_SYMBOL_GPL(ata_scsi_queuecmd); 5168EXPORT_SYMBOL_GPL(ata_scsi_queuecmd);
5172EXPORT_SYMBOL_GPL(ata_scsi_error); 5169EXPORT_SYMBOL_GPL(ata_scsi_error);
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 576788de962a..45646f6ebbf5 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -500,6 +500,9 @@ extern int ata_scsi_device_suspend(struct scsi_device *);
500extern int ata_device_resume(struct ata_port *, struct ata_device *); 500extern int ata_device_resume(struct ata_port *, struct ata_device *);
501extern int ata_device_suspend(struct ata_port *, struct ata_device *); 501extern int ata_device_suspend(struct ata_port *, struct ata_device *);
502extern int ata_ratelimit(void); 502extern int ata_ratelimit(void);
503extern unsigned int ata_busy_sleep(struct ata_port *ap,
504 unsigned long timeout_pat,
505 unsigned long timeout);
503 506
504/* 507/*
505 * Default driver ops implementations 508 * Default driver ops implementations