Skip to content

Commit

Permalink
[PATCH] libata: move IDENTIFY info printing from ata_dev_read_id() to…
Browse files Browse the repository at this point in the history
… ata_dev_configure()

Move IDENTIFY info printing from ata_dev_read_id() to
ata_dev_configure() and print only if @print_info is non-zero.  This
kills duplicate IDENTIFY info printing during probing.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Tejun Heo authored and Jeff Garzik committed Mar 17, 2006
1 parent 1148c3a commit c39f5eb
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions drivers/scsi/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1120,12 +1120,6 @@ static int ata_dev_read_id(struct ata_port *ap, struct ata_device *dev,

swap_buf_le16(id, ATA_ID_WORDS);

/* print device capabilities */
printk(KERN_DEBUG "ata%u: dev %u cfg "
"49:%04x 82:%04x 83:%04x 84:%04x 85:%04x 86:%04x 87:%04x 88:%04x\n",
ap->id, dev->devno,
id[49], id[82], id[83], id[84], id[85], id[86], id[87], id[88]);

/* sanity check */
if ((class == ATA_DEV_ATA) != ata_id_is_ata(id)) {
rc = -EINVAL;
Expand Down Expand Up @@ -1205,6 +1199,13 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev,

DPRINTK("ENTER, host %u, dev %u\n", ap->id, dev->devno);

/* print device capabilities */
if (print_info)
printk(KERN_DEBUG "ata%u: dev %u cfg 49:%04x 82:%04x 83:%04x "
"84:%04x 85:%04x 86:%04x 87:%04x 88:%04x\n",
ap->id, dev->devno, id[49], id[82], id[83],
id[84], id[85], id[86], id[87], id[88]);

/* initialize to-be-configured parameters */
dev->flags = 0;
dev->max_sectors = 0;
Expand Down

0 comments on commit c39f5eb

Please sign in to comment.