Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: kill ATA_HORKAGE_DMA_RW_ONLY
  libata: use PIO for non-16 byte aligned ATAPI commands
  libata: call ata_check_atapi_dma() with qc better prepared
  libata: fix infinite EH waiting bug
  libata: fix ata_dev_disable()
  pata_it821x: fix section mismatch warning
  libata: remove unused variable from ata_eh_reset()
  libata: be less verbose about hpa
  libata: kill non-sense warning message
  libata: kill the infamous abnormal status message
  HPT374 is UDMA100 not UDMA133

1 files changed, 3 insertions, 6 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 745c4f9b4caa..620da7be07b7 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -298,7 +298,6 @@ enum {
         ATA_HORKAGE_NODMA       = (1 << 1),     /* DMA problems */
         ATA_HORKAGE_NONCQ       = (1 << 2),     /* Don't use NCQ */
         ATA_HORKAGE_MAX_SEC_128 = (1 << 3),     /* Limit max sects to 128 */
-        ATA_HORKAGE_DMA_RW_ONLY = (1 << 4),     /* ATAPI DMA for RW only */
 };
 
 enum hsm_task_states {
@@ -1088,11 +1087,9 @@ static inline u8 ata_wait_idle(struct ata_port *ap)
 {
         u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);
 
-        if (status != 0xff && (status & (ATA_BUSY | ATA_DRQ))) {
-                if (ata_msg_warn(ap))
-                        printk(KERN_WARNING "ATA: abnormal status 0x%X on port 0x%p\n",
-                                status, ap->ioaddr.status_addr);
-        }
+        if (status != 0xff && (status & (ATA_BUSY | ATA_DRQ)))
+                DPRINTK("ATA: abnormal status 0x%X on port 0x%p\n",
+                        status, ap->ioaddr.status_addr);
 
         return status;
 }