Patch kills spurious empty line in the kernel log
ans also glues together some back-to-back printks.
--
vda
--- linux-2.6.11.src/drivers/ide/ide-lib.c.orig Thu Mar 3 09:30:33 2005
+++ linux-2.6.11.src/drivers/ide/ide-lib.c Tue Mar 22 12:37:39 2005
@@ -487,8 +487,7 @@ static u8 ide_dump_ata_status(ide_drive_
u8 err = 0;
local_irq_set(flags);
- printk("%s: %s: status=0x%02x", drive->name, msg, stat);
- printk(" { ");
+ printk("%s: %s: status=0x%02x { ", drive->name, msg, stat);
if (stat & BUSY_STAT)
printk("Busy ");
else {
@@ -500,12 +499,10 @@ static u8 ide_dump_ata_status(ide_drive_
if (stat & INDEX_STAT) printk("Index ");
if (stat & ERR_STAT) printk("Error ");
}
- printk("}");
- printk("\n");
+ printk("}\n");
if ((stat & (BUSY_STAT|ERR_STAT)) == ERR_STAT) {
err = hwif->INB(IDE_ERROR_REG);
- printk("%s: %s: error=0x%02x", drive->name, msg, err);
- printk(" { ");
+ printk("%s: %s: error=0x%02x { ", drive->name, msg, err);
if (err & ABRT_ERR) printk("DriveStatusError ");
if (err & ICRC_ERR)
printk("Bad%s ", (err & ABRT_ERR) ? "CRC" : "Sector");
@@ -546,8 +543,8 @@ static u8 ide_dump_ata_status(ide_drive_
printk(", sector=%llu",
(unsigned long long)HWGROUP(drive)->rq->sector);
}
+ printk("\n");
}
- printk("\n");
ide_dump_opcode(drive);
local_irq_restore(flags);
return err;
