leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi: libsas: Drop sas_printk()

Browse Source 
The printk wrapper sas_printk() adds little value now that libsas logs
already have the "sas" prefix through pr_fmt(fmt), so just use pr_notice()
directly.

In addition, strings which span multiple lines are reunited.

Originally-from: 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:30 +08:00 committed by Martin K. Petersen
parent d188e5db9d
commit 71a4a99231
4 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/libsas/sas_expander.c
View File

@ -393,7 +393,7 @@ static int sas_ex_phy_discover_helper(struct domain_device *dev, u8 *disc_req,
return res; return res;
dr = &((struct smp_resp *)disc_resp)->disc; dr = &((struct smp_resp *)disc_resp)->disc;
if (memcmp(dev->sas_addr, dr->attached_sas_addr, SAS_ADDR_SIZE) == 0) { if (memcmp(dev->sas_addr, dr->attached_sas_addr, SAS_ADDR_SIZE) == 0) {
sas_printk("Found loopback topology, just ignore it!\n"); pr_notice("Found loopback topology, just ignore it!\n");
return 0; return 0;
} }
sas_set_ex_phy(dev, single, disc_resp); sas_set_ex_phy(dev, single, disc_resp);
@ -1262,9 +1262,7 @@ static void sas_print_parent_topology_bug(struct domain_device *child,
}; };
struct domain_device *parent = child->parent; struct domain_device *parent = child->parent;
sas_printk("%s ex %016llx phy 0x%x <--> %s ex %016llx " pr_notice("%s ex %016llx phy 0x%x <--> %s ex %016llx phy 0x%x has %c:%c routing link!\n",
"phy 0x%x has %c:%c routing link!\n",
ex_type[parent->dev_type], ex_type[parent->dev_type],
SAS_ADDR(parent->sas_addr), SAS_ADDR(parent->sas_addr),
parent_phy->phy_id, parent_phy->phy_id,

2
drivers/scsi/libsas/sas_init.c
View File

@ -623,7 +623,7 @@ struct asd_sas_event *sas_alloc_event(struct asd_sas_phy *phy)
if (atomic_read(&phy->event_nr) > phy->ha->event_thres) { if (atomic_read(&phy->event_nr) > phy->ha->event_thres) {
if (i->dft->lldd_control_phy) { if (i->dft->lldd_control_phy) {
if (cmpxchg(&phy->in_shutdown, 0, 1) == 0) { if (cmpxchg(&phy->in_shutdown, 0, 1) == 0) {
sas_printk("The phy%02d bursting events, shut it down.\n", pr_notice("The phy%02d bursting events, shut it down.\n",
phy->id); phy->id);
sas_notify_phy_event(phy, PHYE_SHUTDOWN); sas_notify_phy_event(phy, PHYE_SHUTDOWN);
} }

2
drivers/scsi/libsas/sas_internal.h
View File

@ -40,8 +40,6 @@
#define pr_fmt(fmt) SAS_FMT fmt #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 fmt, ## __VA_ARGS__)

4
drivers/scsi/libsas/sas_phy.c
View File

@ -122,10 +122,10 @@ static void sas_phye_shutdown(struct work_struct *work)
phy->enabled = 0; phy->enabled = 0;
ret = i->dft->lldd_control_phy(phy, PHY_FUNC_DISABLE, NULL); ret = i->dft->lldd_control_phy(phy, PHY_FUNC_DISABLE, NULL);
if (ret) if (ret)
sas_printk("lldd disable phy%02d returned %d\n", pr_notice("lldd disable phy%02d returned %d\n",
phy->id, ret); phy->id, ret);
} else } else
sas_printk("phy%02d is not enabled, cannot shutdown\n", pr_notice("phy%02d is not enabled, cannot shutdown\n",
phy->id); phy->id);
} }