4 files changed, 17 insertions, 8 deletions

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 7b24dff17460..587d5aac7d5d 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -576,7 +576,7 @@ static void idedisk_prepare_flush(struct request_queue *q, struct request *rq)
         BUG_ON(task == NULL);
 
         memset(task, 0, sizeof(*task));
-        if (ide_id_has_flush_cache_ext(drive->id) &&
+        if (ata_id_flush_ext_enabled(drive->id) &&
             (drive->capacity64 >= (1UL << 28)))
                 task->tf.command = ATA_CMD_FLUSH_EXT;
         else
@@ -653,7 +653,7 @@ static void update_ordered(ide_drive_t *drive)
                 capacity = idedisk_capacity(drive);
                 barrier = ata_id_flush_enabled(id) && !drive->noflush &&
                         (drive->addressing == 0 || capacity <= (1ULL << 28) ||
-                         ide_id_has_flush_cache_ext(id));
+                         ata_id_flush_ext_enabled(id));
 
                 printk(KERN_INFO "%s: cache flushes %ssupported\n",
                        drive->name, barrier ? "" : "not ");
@@ -699,7 +699,7 @@ static int do_idedisk_flushcache(ide_drive_t *drive)
         ide_task_t args;
 
         memset(&args, 0, sizeof(ide_task_t));
-        if (ide_id_has_flush_cache_ext(drive->id))
+        if (ata_id_flush_ext_enabled(drive->id))
                 args.tf.command = ATA_CMD_FLUSH_EXT;
         else
                 args.tf.command = ATA_CMD_FLUSH;
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index c1596178fcae..ec6664b0d3a9 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -188,7 +188,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
                         ide_complete_power_step(drive, rq, 0, 0);
                         return ide_stopped;
                 }
-                if (ide_id_has_flush_cache_ext(drive->id))
+                if (ata_id_flush_ext_enabled(drive->id))
                         args->tf.command = ATA_CMD_FLUSH_EXT;
                 else
                         args->tf.command = ATA_CMD_FLUSH;
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 921cf0fc337f..81d9adeb819e 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -574,6 +574,19 @@ static inline int ata_id_has_flush_ext(const u16 *id)
         return id[ATA_ID_COMMAND_SET_2] & (1 << 13);
 }
 
+static inline int ata_id_flush_ext_enabled(const u16 *id)
+{
+        if (ata_id_has_flush_ext(id) == 0)
+                return 0;
+        if ((id[ATA_ID_CSF_DEFAULT] & 0xC000) != 0x4000)
+                return 0;
+        /*
+         * some Maxtor disks have bit 13 defined incorrectly
+         * so check bit 10 too
+         */
+        return (id[ATA_ID_CFS_ENABLE_2] & 0x2400) == 0x2400;
+}
+
 static inline int ata_id_has_lba48(const u16 *id)
 {
         if ((id[ATA_ID_COMMAND_SET_2] & 0xC000) != 0x4000)
diff --git a/include/linux/ide.h b/include/linux/ide.h
index d2213d7cc4cb..432eb98f7fe7 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1453,10 +1453,6 @@ extern struct mutex ide_cfg_mtx;
 extern struct bus_type ide_bus_type;
 extern struct class *ide_port_class;
 
-/* some Maxtor disks have bit 13 defined incorrectly so check bit 10 too */
-#define ide_id_has_flush_cache_ext(id)  \
-        (((id)[ATA_ID_CFS_ENABLE_2] & 0x2400) == 0x2400)
-
 static inline void ide_dump_identify(u8 *id)
 {
         print_hex_dump(KERN_INFO, "", DUMP_PREFIX_NONE, 16, 2, id, 512, 0);