tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] libata-core.c: restore configuration boot messages in ata_dev_configure(), v2

This one looks better, IMHO.

This restores the default libata configuration messages printed during booting.

Signed-off-by: <petkov@math.uni-muenster.de>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

authored by Borislav Petkov and committed by Jeff Garzik 5afc8142 d2298dca

+5 -5
unified split
+5 -5
drivers/scsi/libata-core.c
··· 1417 1417 ata_dev_config_ncq(dev, ncq_desc, sizeof(ncq_desc)); 1418 1418 1419 1419 /* print device info to dmesg */ 1420 - if (ata_msg_info(ap)) 1420 + if (ata_msg_drv(ap) && print_info) 1421 1421 ata_dev_printk(dev, KERN_INFO, "ATA-%d, " 1422 1422 "max %s, %Lu sectors: %s %s\n", 1423 1423 ata_id_major_version(id), ··· 1440 1440 } 1441 1441 1442 1442 /* print device info to dmesg */ 1443 - if (ata_msg_info(ap)) 1443 + if (ata_msg_drv(ap) && print_info) 1444 1444 ata_dev_printk(dev, KERN_INFO, "ATA-%d, " 1445 1445 "max %s, %Lu sectors: CHS %u/%u/%u\n", 1446 1446 ata_id_major_version(id), ··· 1452 1452 1453 1453 if (dev->id[59] & 0x100) { 1454 1454 dev->multi_count = dev->id[59] & 0xff; 1455 - if (ata_msg_info(ap)) 1455 + if (ata_msg_drv(ap) && print_info) 1456 1456 ata_dev_printk(dev, KERN_INFO, 1457 1457 "ata%u: dev %u multi count %u\n", 1458 1458 ap->id, dev->devno, dev->multi_count); ··· 1481 1481 } 1482 1482 1483 1483 /* print device info to dmesg */ 1484 - if (ata_msg_info(ap)) 1484 + if (ata_msg_drv(ap) && print_info) 1485 1485 ata_dev_printk(dev, KERN_INFO, "ATAPI, max %s%s\n", 1486 1486 ata_mode_string(xfer_mask), 1487 1487 cdb_intr_string); ··· 1491 1491 1492 1492 /* limit bridge transfers to udma5, 200 sectors */ 1493 1493 if (ata_dev_knobble(dev)) { 1494 - if (ata_msg_info(ap)) 1494 + if (ata_msg_drv(ap) && print_info) 1495 1495 ata_dev_printk(dev, KERN_INFO, 1496 1496 "applying bridge limits\n"); 1497 1497 dev->udma_mask &= ATA_UDMA5;