diff options
Diffstat (limited to 'include/linux/libata.h')
| -rw-r--r-- | include/linux/libata.h | 9 |
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 { | |||
| 298 | ATA_HORKAGE_NODMA = (1 << 1), /* DMA problems */ | 298 | ATA_HORKAGE_NODMA = (1 << 1), /* DMA problems */ |
| 299 | ATA_HORKAGE_NONCQ = (1 << 2), /* Don't use NCQ */ | 299 | ATA_HORKAGE_NONCQ = (1 << 2), /* Don't use NCQ */ |
| 300 | ATA_HORKAGE_MAX_SEC_128 = (1 << 3), /* Limit max sects to 128 */ | 300 | ATA_HORKAGE_MAX_SEC_128 = (1 << 3), /* Limit max sects to 128 */ |
| 301 | ATA_HORKAGE_DMA_RW_ONLY = (1 << 4), /* ATAPI DMA for RW only */ | ||
| 302 | }; | 301 | }; |
| 303 | 302 | ||
| 304 | enum hsm_task_states { | 303 | enum hsm_task_states { |
| @@ -1088,11 +1087,9 @@ static inline u8 ata_wait_idle(struct ata_port *ap) | |||
| 1088 | { | 1087 | { |
| 1089 | u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000); | 1088 | u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000); |
| 1090 | 1089 | ||
| 1091 | if (status != 0xff && (status & (ATA_BUSY | ATA_DRQ))) { | 1090 | if (status != 0xff && (status & (ATA_BUSY | ATA_DRQ))) |
| 1092 | if (ata_msg_warn(ap)) | 1091 | DPRINTK("ATA: abnormal status 0x%X on port 0x%p\n", |
| 1093 | printk(KERN_WARNING "ATA: abnormal status 0x%X on port 0x%p\n", | 1092 | status, ap->ioaddr.status_addr); |
| 1094 | status, ap->ioaddr.status_addr); | ||
| 1095 | } | ||
| 1096 | 1093 | ||
| 1097 | return status; | 1094 | return status; |
| 1098 | } | 1095 | } |
