[PATCH] libata: use new SCR and on/offline functions

Use new SCR and on/offline functions.  Note that for LLDD which know
it implements SCR callbacks, SCR functions are guaranteed to succeed
and ata_port_online() == !ata_port_offline().

Signed-off-by: Tejun Heo <htejun@gmail.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c
index 45b9e37c191..bedc787dafd 100644
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
@@ -464,7 +464,7 @@ static int sil24_softreset(struct ata_port *ap, unsigned int *class)
 
         DPRINTK("ENTER\n");
 
-        if (!sata_dev_present(ap)) {
+        if (ata_port_offline(ap)) {
                 DPRINTK("PHY reports no device\n");
                 *class = ATA_DEV_NONE;
                 goto out;
@@ -531,7 +531,7 @@ static int sil24_hardreset(struct ata_port *ap, unsigned int *class)
         sata_set_spd(ap);
 
         tout_msec = 100;
-        if (sata_dev_present(ap))
+        if (ata_port_online(ap))
                 tout_msec = 5000;
 
         writel(PORT_CS_DEV_RST, port + PORT_CTRL_STAT);
@@ -544,7 +544,7 @@ static int sil24_hardreset(struct ata_port *ap, unsigned int *class)
         msleep(100);
 
         if (tmp & PORT_CS_DEV_RST) {
-                if (!sata_dev_present(ap))
+                if (ata_port_offline(ap))
                         return 0;
                 reason = "link not ready";
                 goto err;