From: Robert Hancock This version reduces the length of the SError parsed output strings relative to the previous version of this patch. Signed-off-by: Robert Hancock Signed-off-by: Andrew Morton --- drivers/ata/libata-eh.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff -puN drivers/ata/libata-eh.c~libata-add-human-readable-error-value-decoding-v2 drivers/ata/libata-eh.c --- a/drivers/ata/libata-eh.c~libata-add-human-readable-error-value-decoding-v2 +++ a/drivers/ata/libata-eh.c @@ -1536,23 +1536,23 @@ static void ata_eh_report(struct ata_por if (ehc->i.serror) ata_port_printk(ap, KERN_ERR, "SError: {%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s}\n", - ehc->i.serror & SERR_DATA_RECOVERED ? "RecovDataErr " : "", - ehc->i.serror & SERR_COMM_RECOVERED ? "RecovCommErr " : "", - ehc->i.serror & SERR_DATA ? "UnrecovDataErr " : "", - ehc->i.serror & SERR_PERSISTENT ? "PersistErr " : "", - ehc->i.serror & SERR_PROTOCOL ? "ProtocolErr " : "", - ehc->i.serror & SERR_INTERNAL ? "HostInternalErr " : "", + ehc->i.serror & SERR_DATA_RECOVERED ? "RecovData " : "", + ehc->i.serror & SERR_COMM_RECOVERED ? "RecovComm " : "", + ehc->i.serror & SERR_DATA ? "UnrecovData " : "", + ehc->i.serror & SERR_PERSISTENT ? "Persist " : "", + ehc->i.serror & SERR_PROTOCOL ? "Proto " : "", + ehc->i.serror & SERR_INTERNAL ? "HostInt " : "", ehc->i.serror & SERR_PHYRDY_CHG ? "PHYRdyChg " : "", - ehc->i.serror & SERR_PHY_INT_ERR ? "PHYInternalErr " : "", + ehc->i.serror & SERR_PHY_INT_ERR ? "PHYInt " : "", ehc->i.serror & SERR_COMM_WAKE ? "CommWake " : "", - ehc->i.serror & SERR_10B_8B_ERR ? "10B8BErr " : "", - ehc->i.serror & SERR_DISPARITY ? "Disparity " : "", - ehc->i.serror & SERR_CRC ? "CRCErr " : "", - ehc->i.serror & SERR_HANDSHAKE ? "HandshakeErr " : "", - ehc->i.serror & SERR_LINK_SEQ_ERR ? "LinkSeqErr " : "", - ehc->i.serror & SERR_TRANS_ST_ERROR ? "TransStatTransErr " : "", - ehc->i.serror & SERR_UNRECOG_FIS ? "UnrecogFIS " : "", - ehc->i.serror & SERR_DEV_XCHG ? "DevExchanged " : "" ); + ehc->i.serror & SERR_10B_8B_ERR ? "10B8B " : "", + ehc->i.serror & SERR_DISPARITY ? "Dispar " : "", + ehc->i.serror & SERR_CRC ? "BadCRC " : "", + ehc->i.serror & SERR_HANDSHAKE ? "Handshk " : "", + ehc->i.serror & SERR_LINK_SEQ_ERR ? "LinkSeq " : "", + ehc->i.serror & SERR_TRANS_ST_ERROR ? "TrStaTrns " : "", + ehc->i.serror & SERR_UNRECOG_FIS ? "UnrecFIS " : "", + ehc->i.serror & SERR_DEV_XCHG ? "DevExch " : "" ); for (tag = 0; tag < ATA_MAX_QUEUE; tag++) { static const char *dma_str[] = { _