aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ata/ahci.c2
-rw-r--r--drivers/ata/pdc_adma.c2
-rw-r--r--include/linux/ata.h4
-rw-r--r--include/linux/libata.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 3f1106fdaed1..1aabc81d82f1 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1075,7 +1075,7 @@ static void ahci_host_intr(struct ata_port *ap)
1075 return; 1075 return;
1076 1076
1077 /* ignore interim PIO setup fis interrupts */ 1077 /* ignore interim PIO setup fis interrupts */
1078 if (ata_tag_valid(ap->active_tag) && (status & PORT_IRQ_PIOS_FIS)) 1078 if (ata_tag_valid(ap->active_tag) && (status & PORT_IRQ_PIOS_FIS))
1079 return; 1079 return;
1080 1080
1081 if (ata_ratelimit()) 1081 if (ata_ratelimit())
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index 912211ada816..0e23ecb77bc2 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -497,7 +497,7 @@ static inline unsigned int adma_intr_mmio(struct ata_host *host)
497 continue; 497 continue;
498 DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n", 498 DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n",
499 ap->id, qc->tf.protocol, status); 499 ap->id, qc->tf.protocol, status);
500 500
501 /* complete taskfile transaction */ 501 /* complete taskfile transaction */
502 pp->state = adma_state_idle; 502 pp->state = adma_state_idle;
503 qc->err_mask |= ac_err_mask(status); 503 qc->err_mask |= ac_err_mask(status);
diff --git a/include/linux/ata.h b/include/linux/ata.h
index 991b858acc30..d89441907024 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -320,8 +320,8 @@ static inline unsigned int ata_id_major_version(const u16 *id)
320 320
321static inline int ata_id_current_chs_valid(const u16 *id) 321static inline int ata_id_current_chs_valid(const u16 *id)
322{ 322{
323 /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command 323 /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command
324 has not been issued to the device then the values of 324 has not been issued to the device then the values of
325 id[54] to id[56] are vendor specific. */ 325 id[54] to id[56] are vendor specific. */
326 return (id[53] & 0x01) && /* Current translation valid */ 326 return (id[53] & 0x01) && /* Current translation valid */
327 id[54] && /* cylinders in current translation */ 327 id[54] && /* cylinders in current translation */
diff --git a/include/linux/libata.h b/include/linux/libata.h
index a6d818148ae0..8715305f611f 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -198,7 +198,7 @@ enum {
198 198
199 /* host set flags */ 199 /* host set flags */
200 ATA_HOST_SIMPLEX = (1 << 0), /* Host is simplex, one DMA channel per host only */ 200 ATA_HOST_SIMPLEX = (1 << 0), /* Host is simplex, one DMA channel per host only */
201 201
202 /* various lengths of time */ 202 /* various lengths of time */
203 ATA_TMOUT_BOOT = 30 * HZ, /* heuristic */ 203 ATA_TMOUT_BOOT = 30 * HZ, /* heuristic */
204 ATA_TMOUT_BOOT_QUICK = 7 * HZ, /* heuristic */ 204 ATA_TMOUT_BOOT_QUICK = 7 * HZ, /* heuristic */