From ed3640b285d831065eb0507cdca7d125f6f78e8d Mon Sep 17 00:00:00 2001 From: Stefan Haberland Date: Mon, 25 Oct 2010 16:10:24 +0200 Subject: [S390] dasd fix dump_sense_dbf The dasd_eckd_dump_sense_dbf function uses a macro for s390 debug feature that can handle up to 8 parameters (for the DASD device driver). Fix the function to use only the maximum number of parameters. Signed-off-by: Stefan Haberland Signed-off-by: Martin Schwidefsky --- drivers/s390/block/dasd_eckd.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'drivers/s390') diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c index 59b4ecfb967b..ea0e565ebc9d 100644 --- a/drivers/s390/block/dasd_eckd.c +++ b/drivers/s390/block/dasd_eckd.c @@ -3093,16 +3093,20 @@ dasd_eckd_dump_sense_dbf(struct dasd_device *device, struct irb *irb, char *reason) { u64 *sense; + u32 stat; sense = (u64 *) dasd_get_sense(irb); + stat = scsw_cstat(&irb->scsw); + stat <<= 8; + stat |= scsw_dstat(&irb->scsw); + stat <<= 8; + stat |= scsw_cc(&irb->scsw); + if (sense) { DBF_DEV_EVENT(DBF_EMERG, device, - "%s: %s %02x%02x%02x %016llx %016llx %016llx " - "%016llx", reason, - scsw_is_tm(&irb->scsw) ? "t" : "c", - scsw_cc(&irb->scsw), scsw_cstat(&irb->scsw), - scsw_dstat(&irb->scsw), sense[0], sense[1], - sense[2], sense[3]); + "%s: %s %06x %016llx %016llx %016llx %016llx", + reason, scsw_is_tm(&irb->scsw) ? "t" : "c", stat, + sense[0], sense[1], sense[2], sense[3]); } else { DBF_DEV_EVENT(DBF_EMERG, device, "%s", "SORRY - NO VALID SENSE AVAILABLE\n"); -- cgit v1.2.3