diff options
author | Wei Liu <wei.liu2@citrix.com> | 2013-07-01 19:08:54 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-07-02 03:52:55 -0400 |
commit | 8ef2c3bca599710a410cbecb4867e27728fef043 (patch) | |
tree | 69f35afca339507c2806fc23408822e2a501259d /drivers/net/xen-netback | |
parent | b48410b4dc9c7306df21e508cc6739a55c350eb8 (diff) |
xen-netback: xenbus.c: use more current logging styles
Convert one printk to pr_<level>.
Add a missing newline in several places to avoid message interleaving,
coalesce formats, reflow modified lines to 80 columns.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/xen-netback')
-rw-r--r-- | drivers/net/xen-netback/xenbus.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c index 04bd860d16a9..1fe48fe364ed 100644 --- a/drivers/net/xen-netback/xenbus.c +++ b/drivers/net/xen-netback/xenbus.c | |||
@@ -130,7 +130,7 @@ static int netback_probe(struct xenbus_device *dev, | |||
130 | "feature-split-event-channels", | 130 | "feature-split-event-channels", |
131 | "%u", separate_tx_rx_irq); | 131 | "%u", separate_tx_rx_irq); |
132 | if (err) | 132 | if (err) |
133 | pr_debug("Error writing feature-split-event-channels"); | 133 | pr_debug("Error writing feature-split-event-channels\n"); |
134 | 134 | ||
135 | err = xenbus_switch_state(dev, XenbusStateInitWait); | 135 | err = xenbus_switch_state(dev, XenbusStateInitWait); |
136 | if (err) | 136 | if (err) |
@@ -145,7 +145,7 @@ abort_transaction: | |||
145 | xenbus_transaction_end(xbt, 1); | 145 | xenbus_transaction_end(xbt, 1); |
146 | xenbus_dev_fatal(dev, err, "%s", message); | 146 | xenbus_dev_fatal(dev, err, "%s", message); |
147 | fail: | 147 | fail: |
148 | pr_debug("failed"); | 148 | pr_debug("failed\n"); |
149 | netback_remove(dev); | 149 | netback_remove(dev); |
150 | return err; | 150 | return err; |
151 | } | 151 | } |
@@ -228,15 +228,14 @@ static void frontend_changed(struct xenbus_device *dev, | |||
228 | { | 228 | { |
229 | struct backend_info *be = dev_get_drvdata(&dev->dev); | 229 | struct backend_info *be = dev_get_drvdata(&dev->dev); |
230 | 230 | ||
231 | pr_debug("frontend state %s", xenbus_strstate(frontend_state)); | 231 | pr_debug("frontend state %s\n", xenbus_strstate(frontend_state)); |
232 | 232 | ||
233 | be->frontend_state = frontend_state; | 233 | be->frontend_state = frontend_state; |
234 | 234 | ||
235 | switch (frontend_state) { | 235 | switch (frontend_state) { |
236 | case XenbusStateInitialising: | 236 | case XenbusStateInitialising: |
237 | if (dev->state == XenbusStateClosed) { | 237 | if (dev->state == XenbusStateClosed) { |
238 | printk(KERN_INFO "%s: %s: prepare for reconnect\n", | 238 | pr_info("%s: prepare for reconnect\n", dev->nodename); |
239 | __func__, dev->nodename); | ||
240 | xenbus_switch_state(dev, XenbusStateInitWait); | 239 | xenbus_switch_state(dev, XenbusStateInitWait); |
241 | } | 240 | } |
242 | break; | 241 | break; |