Utilize durable_name_printk to associate the durable name
with the log message via structured data. The user visible
portion of the log message is unchanged.
Signed-off-by: Tony Asleson <tasleson@xxxxxxxxxx>
---
drivers/ata/libata-core.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index beca5f91bb4c..468aa3f7eaad 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -6444,7 +6444,8 @@ void ata_port_printk(const struct ata_port *ap, const char *level,
vaf.fmt = fmt;
vaf.va = &args;
- printk("%sata%u: %pV", level, ap->print_id, &vaf);
+ durable_name_printk(level, &ap->tdev, "ata%u: %pV",
+ ap->print_id, &vaf);
va_end(args);
}
@@ -6462,11 +6463,11 @@ void ata_link_printk(const struct ata_link *link, const char *level,
vaf.va = &args;
if (sata_pmp_attached(link->ap) || link->ap->slave_link)
- printk("%sata%u.%02u: %pV",
- level, link->ap->print_id, link->pmp, &vaf);
+ durable_name_printk(level, &link->tdev, "ata%u.%02u: %pV",
+ link->ap->print_id, link->pmp, &vaf);
else
- printk("%sata%u: %pV",
- level, link->ap->print_id, &vaf);
+ durable_name_printk(level, &link->tdev, "ata%u: %pV",
+ link->ap->print_id, &vaf);
va_end(args);
}
@@ -6483,9 +6484,9 @@ void ata_dev_printk(const struct ata_device *dev, const char *level,
vaf.fmt = fmt;
vaf.va = &args;
- printk("%sata%u.%02u: %pV",
- level, dev->link->ap->print_id, dev->link->pmp + dev->devno,
- &vaf);
+ durable_name_printk(level, &dev->tdev, "ata%u.%02u: %pV",
+ dev->link->ap->print_id, dev->link->pmp + dev->devno,
+ &vaf);
va_end(args);
}
--
2.26.2
