Commit 91565ebb authored by Joe Perches's avatar Joe Perches Committed by David S. Miller

bonding: Convert pr_warning to pr_warn, neatening

Use more current logging style.

Coalesce formats, realign arguments, drop unnecessary periods.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 327cdeda
...@@ -1243,7 +1243,7 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav ...@@ -1243,7 +1243,7 @@ static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slav
if (free_mac_slave) { if (free_mac_slave) {
alb_set_slave_mac_addr(slave, free_mac_slave->perm_hwaddr); alb_set_slave_mac_addr(slave, free_mac_slave->perm_hwaddr);
pr_warning("%s: Warning: the hw address of slave %s is in use by the bond; giving it the hw address of %s\n", pr_warn("%s: Warning: the hw address of slave %s is in use by the bond; giving it the hw address of %s\n",
bond->dev->name, slave->dev->name, bond->dev->name, slave->dev->name,
free_mac_slave->dev->name); free_mac_slave->dev->name);
......
...@@ -69,7 +69,7 @@ void bond_debug_register(struct bonding *bond) ...@@ -69,7 +69,7 @@ void bond_debug_register(struct bonding *bond)
debugfs_create_dir(bond->dev->name, bonding_debug_root); debugfs_create_dir(bond->dev->name, bonding_debug_root);
if (!bond->debug_dir) { if (!bond->debug_dir) {
pr_warning("%s: Warning: failed to register to debugfs\n", pr_warn("%s: Warning: failed to register to debugfs\n",
bond->dev->name); bond->dev->name);
return; return;
} }
...@@ -98,8 +98,7 @@ void bond_debug_reregister(struct bonding *bond) ...@@ -98,8 +98,7 @@ void bond_debug_reregister(struct bonding *bond)
if (d) { if (d) {
bond->debug_dir = d; bond->debug_dir = d;
} else { } else {
pr_warning("%s: Warning: failed to reregister, " pr_warn("%s: Warning: failed to reregister, so just unregister old one\n",
"so just unregister old one\n",
bond->dev->name); bond->dev->name);
bond_debug_unregister(bond); bond_debug_unregister(bond);
} }
...@@ -110,8 +109,7 @@ void bond_create_debugfs(void) ...@@ -110,8 +109,7 @@ void bond_create_debugfs(void)
bonding_debug_root = debugfs_create_dir("bonding", NULL); bonding_debug_root = debugfs_create_dir("bonding", NULL);
if (!bonding_debug_root) { if (!bonding_debug_root) {
pr_warning("Warning: Cannot create bonding directory" pr_warn("Warning: Cannot create bonding directory in debugfs\n");
" in debugfs\n");
} }
} }
......
This diff is collapsed.
...@@ -254,7 +254,7 @@ void bond_create_proc_entry(struct bonding *bond) ...@@ -254,7 +254,7 @@ void bond_create_proc_entry(struct bonding *bond)
S_IRUGO, bn->proc_dir, S_IRUGO, bn->proc_dir,
&bond_info_fops, bond); &bond_info_fops, bond);
if (bond->proc_entry == NULL) if (bond->proc_entry == NULL)
pr_warning("Warning: Cannot create /proc/net/%s/%s\n", pr_warn("Warning: Cannot create /proc/net/%s/%s\n",
DRV_NAME, bond_dev->name); DRV_NAME, bond_dev->name);
else else
memcpy(bond->proc_file_name, bond_dev->name, IFNAMSIZ); memcpy(bond->proc_file_name, bond_dev->name, IFNAMSIZ);
...@@ -281,7 +281,7 @@ void __net_init bond_create_proc_dir(struct bond_net *bn) ...@@ -281,7 +281,7 @@ void __net_init bond_create_proc_dir(struct bond_net *bn)
if (!bn->proc_dir) { if (!bn->proc_dir) {
bn->proc_dir = proc_mkdir(DRV_NAME, bn->net->proc_net); bn->proc_dir = proc_mkdir(DRV_NAME, bn->net->proc_net);
if (!bn->proc_dir) if (!bn->proc_dir)
pr_warning("Warning: cannot create /proc/net/%s\n", pr_warn("Warning: cannot create /proc/net/%s\n",
DRV_NAME); DRV_NAME);
} }
} }
......
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