ata: libata: move ata_dump_id() to dynamic debugging

Use ata_dev_dbg() to print out the information in ata_dump_id()
and remove the ata_msg_probe() conditional.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 28645ac..d316fbf 100644 (file)
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1341,6 +1341,7 @@ static int ata_hpa_resize(struct ata_device *dev)
 
 /**
  *     ata_dump_id - IDENTIFY DEVICE info debugging output
+ *     @dev: device from which the information is fetched
  *     @id: IDENTIFY DEVICE page to dump
  *
  *     Dump selected 16-bit words from the given IDENTIFY DEVICE
@@ -1350,32 +1351,14 @@ static int ata_hpa_resize(struct ata_device *dev)
  *     caller.
  */
 
-static inline void ata_dump_id(const u16 *id)
-{
-       DPRINTK("49==0x%04x  "
-               "53==0x%04x  "
-               "63==0x%04x  "
-               "64==0x%04x  "
-               "75==0x%04x  \n",
-               id[49],
-               id[53],
-               id[63],
-               id[64],
-               id[75]);
-       DPRINTK("80==0x%04x  "
-               "81==0x%04x  "
-               "82==0x%04x  "
-               "83==0x%04x  "
-               "84==0x%04x  \n",
-               id[80],
-               id[81],
-               id[82],
-               id[83],
-               id[84]);
-       DPRINTK("88==0x%04x  "
-               "93==0x%04x\n",
-               id[88],
-               id[93]);
+static inline void ata_dump_id(struct ata_device *dev, const u16 *id)
+{
+       ata_dev_dbg(dev,
+               "49==0x%04x  53==0x%04x  63==0x%04x  64==0x%04x  75==0x%04x\n"
+               "80==0x%04x  81==0x%04x  82==0x%04x  83==0x%04x  84==0x%04x\n"
+               "88==0x%04x  93==0x%04x\n",
+               id[49], id[53], id[63], id[64], id[75], id[80],
+               id[81], id[82], id[83], id[84], id[88], id[93]);
 }
 
 /**
@@ -2632,8 +2615,7 @@ int ata_dev_configure(struct ata_device *dev)
        /* find max transfer mode; for printk only */
        xfer_mask = ata_id_xfermask(id);
 
-       if (ata_msg_probe(ap))
-               ata_dump_id(id);
+       ata_dump_id(dev, id);
 
        /* SCSI only uses 4-char revisions, dump full 8 chars from ATA */
        ata_id_c_string(dev->id, fwrevbuf, ATA_ID_FW_REV,