diff options
Diffstat (limited to 'drivers/ata/libata-eh.c')
-rw-r--r-- | drivers/ata/libata-eh.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 2eaa39fc65d0..93e2b545b439 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c | |||
@@ -1197,7 +1197,7 @@ void ata_eh_done(struct ata_link *link, struct ata_device *dev, | |||
1197 | * RETURNS: | 1197 | * RETURNS: |
1198 | * Descriptive string for @err_mask | 1198 | * Descriptive string for @err_mask |
1199 | */ | 1199 | */ |
1200 | static const char * ata_err_string(unsigned int err_mask) | 1200 | static const char *ata_err_string(unsigned int err_mask) |
1201 | { | 1201 | { |
1202 | if (err_mask & AC_ERR_HOST_BUS) | 1202 | if (err_mask & AC_ERR_HOST_BUS) |
1203 | return "host bus error"; | 1203 | return "host bus error"; |
@@ -1934,7 +1934,7 @@ static void ata_eh_link_report(struct ata_link *link) | |||
1934 | ehc->i.serror & SERR_LINK_SEQ_ERR ? "LinkSeq " : "", | 1934 | ehc->i.serror & SERR_LINK_SEQ_ERR ? "LinkSeq " : "", |
1935 | ehc->i.serror & SERR_TRANS_ST_ERROR ? "TrStaTrns " : "", | 1935 | ehc->i.serror & SERR_TRANS_ST_ERROR ? "TrStaTrns " : "", |
1936 | ehc->i.serror & SERR_UNRECOG_FIS ? "UnrecFIS " : "", | 1936 | ehc->i.serror & SERR_UNRECOG_FIS ? "UnrecFIS " : "", |
1937 | ehc->i.serror & SERR_DEV_XCHG ? "DevExch " : "" ); | 1937 | ehc->i.serror & SERR_DEV_XCHG ? "DevExch " : ""); |
1938 | 1938 | ||
1939 | for (tag = 0; tag < ATA_MAX_QUEUE; tag++) { | 1939 | for (tag = 0; tag < ATA_MAX_QUEUE; tag++) { |
1940 | static const char *dma_str[] = { | 1940 | static const char *dma_str[] = { |
@@ -1969,17 +1969,17 @@ static void ata_eh_link_report(struct ata_link *link) | |||
1969 | qc->err_mask & AC_ERR_NCQ ? " <F>" : ""); | 1969 | qc->err_mask & AC_ERR_NCQ ? " <F>" : ""); |
1970 | 1970 | ||
1971 | if (res->command & (ATA_BUSY | ATA_DRDY | ATA_DF | ATA_DRQ | | 1971 | if (res->command & (ATA_BUSY | ATA_DRDY | ATA_DF | ATA_DRQ | |
1972 | ATA_ERR) ) { | 1972 | ATA_ERR)) { |
1973 | if (res->command & ATA_BUSY) | 1973 | if (res->command & ATA_BUSY) |
1974 | ata_dev_printk(qc->dev, KERN_ERR, | 1974 | ata_dev_printk(qc->dev, KERN_ERR, |
1975 | "status: { Busy }\n" ); | 1975 | "status: { Busy }\n"); |
1976 | else | 1976 | else |
1977 | ata_dev_printk(qc->dev, KERN_ERR, | 1977 | ata_dev_printk(qc->dev, KERN_ERR, |
1978 | "status: { %s%s%s%s}\n", | 1978 | "status: { %s%s%s%s}\n", |
1979 | res->command & ATA_DRDY ? "DRDY " : "", | 1979 | res->command & ATA_DRDY ? "DRDY " : "", |
1980 | res->command & ATA_DF ? "DF " : "", | 1980 | res->command & ATA_DF ? "DF " : "", |
1981 | res->command & ATA_DRQ ? "DRQ " : "", | 1981 | res->command & ATA_DRQ ? "DRQ " : "", |
1982 | res->command & ATA_ERR ? "ERR " : "" ); | 1982 | res->command & ATA_ERR ? "ERR " : ""); |
1983 | } | 1983 | } |
1984 | 1984 | ||
1985 | if (cmd->command != ATA_CMD_PACKET && | 1985 | if (cmd->command != ATA_CMD_PACKET && |
@@ -1990,7 +1990,7 @@ static void ata_eh_link_report(struct ata_link *link) | |||
1990 | res->feature & ATA_ICRC ? "ICRC " : "", | 1990 | res->feature & ATA_ICRC ? "ICRC " : "", |
1991 | res->feature & ATA_UNC ? "UNC " : "", | 1991 | res->feature & ATA_UNC ? "UNC " : "", |
1992 | res->feature & ATA_IDNF ? "IDNF " : "", | 1992 | res->feature & ATA_IDNF ? "IDNF " : "", |
1993 | res->feature & ATA_ABORTED ? "ABRT " : "" ); | 1993 | res->feature & ATA_ABORTED ? "ABRT " : ""); |
1994 | } | 1994 | } |
1995 | } | 1995 | } |
1996 | 1996 | ||
@@ -2611,7 +2611,7 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, | |||
2611 | ehc->i.flags = 0; | 2611 | ehc->i.flags = 0; |
2612 | continue; | 2612 | continue; |
2613 | 2613 | ||
2614 | dev_fail: | 2614 | dev_fail: |
2615 | nr_failed_devs++; | 2615 | nr_failed_devs++; |
2616 | if (ata_eh_handle_dev_fail(dev, rc)) | 2616 | if (ata_eh_handle_dev_fail(dev, rc)) |
2617 | nr_disabled_devs++; | 2617 | nr_disabled_devs++; |