Commit d188e5db authored by John Garry's avatar John Garry Committed by Martin K. Petersen

scsi: libsas: Use pr_fmt(fmt)

In preparation for dropping the libsas printk wrappers, use pr_fmt(fmt)
declaration to add the framework log prefix - "sas".
Suggested-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 1399846d
...@@ -375,7 +375,7 @@ static int sas_ata_printk(const char *level, const struct domain_device *ddev, ...@@ -375,7 +375,7 @@ static int sas_ata_printk(const char *level, const struct domain_device *ddev,
vaf.fmt = fmt; vaf.fmt = fmt;
vaf.va = &args; vaf.va = &args;
r = printk("%ssas: ata%u: %s: %pV", r = printk("%s" SAS_FMT "ata%u: %s: %pV",
level, ap->print_id, dev_name(dev), &vaf); level, ap->print_id, dev_name(dev), &vaf);
va_end(args); va_end(args);
......
...@@ -32,9 +32,18 @@ ...@@ -32,9 +32,18 @@
#include <scsi/libsas.h> #include <scsi/libsas.h>
#include <scsi/sas_ata.h> #include <scsi/sas_ata.h>
#define sas_printk(fmt, ...) printk(KERN_NOTICE "sas: " fmt, ## __VA_ARGS__) #ifdef pr_fmt
#undef pr_fmt
#endif
#define SAS_FMT "sas: "
#define pr_fmt(fmt) SAS_FMT fmt
#define sas_printk(fmt, ...) printk(KERN_NOTICE fmt, ## __VA_ARGS__)
#define SAS_DPRINTK(fmt, ...) printk(KERN_DEBUG fmt, ## __VA_ARGS__)
#define SAS_DPRINTK(fmt, ...) printk(KERN_DEBUG "sas: " fmt, ## __VA_ARGS__)
#define TO_SAS_TASK(_scsi_cmd) ((void *)(_scsi_cmd)->host_scribble) #define TO_SAS_TASK(_scsi_cmd) ((void *)(_scsi_cmd)->host_scribble)
#define ASSIGN_SAS_TASK(_sc, _t) do { (_sc)->host_scribble = (void *) _t; } while (0) #define ASSIGN_SAS_TASK(_sc, _t) do { (_sc)->host_scribble = (void *) _t; } while (0)
......
#include "sas_internal.h"
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/export.h> #include <linux/export.h>
#include <scsi/sas.h> #include <scsi/sas.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment