ChangeSet 1.1537.6.3, 2005/02/13 15:15:55-05:00, [EMAIL PROTECTED]
[libata] resync with 2.6 msleep() updates
Now that 2.4 has msleep, we can update the libata code to be closer
to the 2.6 code, reducing the maintenance burden on moi.
drivers/scsi/ahci.c | 2 --
drivers/scsi/libata-core.c | 1 -
drivers/scsi/sata_promise.c | 2 --
drivers/scsi/sata_sx4.c | 6 ++----
include/linux/libata-compat.h | 5 -----
5 files changed, 2 insertions(+), 14 deletions(-)
diff -Nru a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
--- a/drivers/scsi/ahci.c 2005-03-04 12:02:10 -08:00
+++ b/drivers/scsi/ahci.c 2005-03-04 12:02:10 -08:00
@@ -40,8 +40,6 @@
#define DRV_NAME "ahci"
#define DRV_VERSION "1.00"
-#define msleep libata_msleep /* 2.4-specific */
-
enum {
AHCI_PCI_BAR = 5,
AHCI_MAX_SG = 168, /* hardware max is 64K */
diff -Nru a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
--- a/drivers/scsi/libata-core.c 2005-03-04 12:02:10 -08:00
+++ b/drivers/scsi/libata-core.c 2005-03-04 12:02:10 -08:00
@@ -3940,7 +3940,6 @@
EXPORT_SYMBOL_GPL(ata_scsi_error);
EXPORT_SYMBOL_GPL(ata_scsi_detect);
EXPORT_SYMBOL_GPL(ata_add_to_probe_list);
-EXPORT_SYMBOL_GPL(libata_msleep);
EXPORT_SYMBOL_GPL(ssleep);
EXPORT_SYMBOL_GPL(ata_scsi_release);
EXPORT_SYMBOL_GPL(ata_host_intr);
diff -Nru a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
--- a/drivers/scsi/sata_promise.c 2005-03-04 12:02:10 -08:00
+++ b/drivers/scsi/sata_promise.c 2005-03-04 12:02:10 -08:00
@@ -42,8 +42,6 @@
#define DRV_NAME "sata_promise"
#define DRV_VERSION "1.01"
-#define msleep libata_msleep /* 2.4-specific */
-
enum {
PDC_PKT_SUBMIT = 0x40, /* Command packet pointer addr */
PDC_INT_SEQMASK = 0x40, /* Mask of asserted SEQ INTs */
diff -Nru a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
--- a/drivers/scsi/sata_sx4.c 2005-03-04 12:02:10 -08:00
+++ b/drivers/scsi/sata_sx4.c 2005-03-04 12:02:10 -08:00
@@ -1191,8 +1191,7 @@
error = 0;
break;
}
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout((i * 100) * HZ / 1000 + 1);
+ msleep(i*100);
}
return error;
}
@@ -1225,8 +1224,7 @@
readl(mmio + PDC_TIME_CONTROL);
/* Wait 3 seconds */
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(3 * HZ);
+ msleep(3000);
/*
When timer is enabled, counter is decreased every internal
diff -Nru a/include/linux/libata-compat.h b/include/linux/libata-compat.h
--- a/include/linux/libata-compat.h 2005-03-04 12:02:10 -08:00
+++ b/include/linux/libata-compat.h 2005-03-04 12:02:10 -08:00
@@ -10,11 +10,6 @@
struct pci_dev pdev;
};
-static inline void libata_msleep(unsigned long msecs)
-{
- msleep(msecs);
-}
-
static inline struct pci_dev *to_pci_dev(struct device *dev)
{
return (struct pci_dev *) dev;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-24" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
