redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

scsi: libsas: Use pr_fmt(fmt)

Browse source 
In preparation for dropping the libsas printk wrappers, use pr_fmt(fmt)
declaration to add the framework log prefix - "sas".

Suggested-by: Joe Perches <joe@perches.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
John Garry 2018-11-15 18:20:29 +08:00 committed by Martin K. Petersen
parent 1399846d4b
commit d188e5db9d
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/scsi/libsas/sas_ata.c
View file

@ -375,7 +375,7 @@ static int sas_ata_printk(const char *level, const struct domain_device *ddev,
vaf.fmt = fmt;
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);
va_end(args);

13
drivers/scsi/libsas/sas_internal.h
View file

@ -32,9 +32,18 @@
#include <scsi/libsas.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 ASSIGN_SAS_TASK(_sc, _t) do { (_sc)->host_scribble = (void *) _t; } while (0)

3
drivers/scsi/libsas/sas_task.c
View file

@ -1,3 +1,6 @@
#include "sas_internal.h"
#include <linux/kernel.h>
#include <linux/export.h>
#include <scsi/sas.h>