1 files changed, 13 insertions, 13 deletions

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 47c7afcb36f2..4040d8b53216 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -517,7 +517,7 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)
         /* Good values for timeout and retries?  Values below
            from scsi_ioctl_send_command() for default case... */
         cmd_result = scsi_execute(scsidev, scsi_cmd, data_dir, argbuf, argsize,
-                                  sensebuf, (10*HZ), 5, 0);
+                                  sensebuf, (10*HZ), 5, 0, NULL);
 
         if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */
                 u8 *desc = sensebuf + 8;
@@ -603,7 +603,7 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg)
         /* Good values for timeout and retries?  Values below
            from scsi_ioctl_send_command() for default case... */
         cmd_result = scsi_execute(scsidev, scsi_cmd, DMA_NONE, NULL, 0,
-                                sensebuf, (10*HZ), 5, 0);
+                                sensebuf, (10*HZ), 5, 0, NULL);
 
         if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */
                 u8 *desc = sensebuf + 8;
@@ -3229,12 +3229,12 @@ void ata_scsi_scan_host(struct ata_port *ap, int sync)
                 return;
 
  repeat:
-        ata_port_for_each_link(link, ap) {
-                ata_link_for_each_dev(dev, link) {
+        ata_for_each_link(link, ap, EDGE) {
+                ata_for_each_dev(dev, link, ENABLED) {
                         struct scsi_device *sdev;
                         int channel = 0, id = 0;
 
-                        if (!ata_dev_enabled(dev) || dev->sdev)
+                        if (dev->sdev)
                                 continue;
 
                         if (ata_is_host_link(link))
@@ -3255,9 +3255,9 @@ void ata_scsi_scan_host(struct ata_port *ap, int sync)
          * failure occurred, scan would have failed silently.  Check
          * whether all devices are attached.
          */
-        ata_port_for_each_link(link, ap) {
-                ata_link_for_each_dev(dev, link) {
-                        if (ata_dev_enabled(dev) && !dev->sdev)
+        ata_for_each_link(link, ap, EDGE) {
+                ata_for_each_dev(dev, link, ENABLED) {
+                        if (!dev->sdev)
                                 goto exit_loop;
                 }
         }
@@ -3381,7 +3381,7 @@ static void ata_scsi_handle_link_detach(struct ata_link *link)
         struct ata_port *ap = link->ap;
         struct ata_device *dev;
 
-        ata_link_for_each_dev(dev, link) {
+        ata_for_each_dev(dev, link, ALL) {
                 unsigned long flags;
 
                 if (!(dev->flags & ATA_DFLAG_DETACHED))
@@ -3496,7 +3496,7 @@ static int ata_scsi_user_scan(struct Scsi_Host *shost, unsigned int channel,
         if (devno == SCAN_WILD_CARD) {
                 struct ata_link *link;
 
-                ata_port_for_each_link(link, ap) {
+                ata_for_each_link(link, ap, EDGE) {
                         struct ata_eh_info *ehi = &link->eh_info;
                         ehi->probe_mask |= ATA_ALL_DEVICES;
                         ehi->action |= ATA_EH_RESET;
@@ -3544,11 +3544,11 @@ void ata_scsi_dev_rescan(struct work_struct *work)
 
         spin_lock_irqsave(ap->lock, flags);
 
-        ata_port_for_each_link(link, ap) {
-                ata_link_for_each_dev(dev, link) {
+        ata_for_each_link(link, ap, EDGE) {
+                ata_for_each_dev(dev, link, ENABLED) {
                         struct scsi_device *sdev = dev->sdev;
 
-                        if (!ata_dev_enabled(dev) || !sdev)
+                        if (!sdev)
                                 continue;
                         if (scsi_device_get(sdev))
                                 continue;