[PATCH net-next] xen-netback: xenbus.c: use more current logging styles

[PATCH net-next] xen-netback: xenbus.c: use more current logging styles

[Wei Liu]

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>
---
 drivers/net/xen-netback/xenbus.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
index 04bd860..1fe48fe3 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,
 			    "feature-split-event-channels",
 			    "%u", separate_tx_rx_irq);
 	if (err)
-		pr_debug("Error writing feature-split-event-channels");
+		pr_debug("Error writing feature-split-event-channels\n");
 
 	err = xenbus_switch_state(dev, XenbusStateInitWait);
 	if (err)
@@ -145,7 +145,7 @@ abort_transaction:
 	xenbus_transaction_end(xbt, 1);
 	xenbus_dev_fatal(dev, err, "%s", message);
 fail:
-	pr_debug("failed");
+	pr_debug("failed\n");
 	netback_remove(dev);
 	return err;
 }
@@ -228,15 +228,14 @@ static void frontend_changed(struct xenbus_device *dev,
 {
 	struct backend_info *be = dev_get_drvdata(&dev->dev);
 
-	pr_debug("frontend state %s", xenbus_strstate(frontend_state));
+	pr_debug("frontend state %s\n", xenbus_strstate(frontend_state));
 
 	be->frontend_state = frontend_state;
 
 	switch (frontend_state) {
 	case XenbusStateInitialising:
 		if (dev->state == XenbusStateClosed) {
-			printk(KERN_INFO "%s: %s: prepare for reconnect\n",
-			       __func__, dev->nodename);
+			pr_info("%s: prepare for reconnect\n", dev->nodename);
 			xenbus_switch_state(dev, XenbusStateInitWait);
 		}
 		break;
-- 
1.7.10.4

Re: [PATCH net-next] xen-netback: xenbus.c: use more current logging styles

[Wei Liu]

Hi Joe,

You previous patch to clean up netback.c has gone in, but your later
modificaion to xenbus.c was not a proper patch. So now I make a proper
patch for your changeset and submit it with your SoB, hope this is OK.


Wei.

On Tue, Jul 02, 2013 at 12:08:54AM +0100, Wei Liu wrote:
> 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>
> ---
>  drivers/net/xen-netback/xenbus.c |    9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c
> index 04bd860..1fe48fe3 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,
>  			    "feature-split-event-channels",
>  			    "%u", separate_tx_rx_irq);
>  	if (err)
> -		pr_debug("Error writing feature-split-event-channels");
> +		pr_debug("Error writing feature-split-event-channels\n");
>  
>  	err = xenbus_switch_state(dev, XenbusStateInitWait);
>  	if (err)
> @@ -145,7 +145,7 @@ abort_transaction:
>  	xenbus_transaction_end(xbt, 1);
>  	xenbus_dev_fatal(dev, err, "%s", message);
>  fail:
> -	pr_debug("failed");
> +	pr_debug("failed\n");
>  	netback_remove(dev);
>  	return err;
>  }
> @@ -228,15 +228,14 @@ static void frontend_changed(struct xenbus_device *dev,
>  {
>  	struct backend_info *be = dev_get_drvdata(&dev->dev);
>  
> -	pr_debug("frontend state %s", xenbus_strstate(frontend_state));
> +	pr_debug("frontend state %s\n", xenbus_strstate(frontend_state));
>  
>  	be->frontend_state = frontend_state;
>  
>  	switch (frontend_state) {
>  	case XenbusStateInitialising:
>  		if (dev->state == XenbusStateClosed) {
> -			printk(KERN_INFO "%s: %s: prepare for reconnect\n",
> -			       __func__, dev->nodename);
> +			pr_info("%s: prepare for reconnect\n", dev->nodename);
>  			xenbus_switch_state(dev, XenbusStateInitWait);
>  		}
>  		break;
> -- 
> 1.7.10.4

Re: [PATCH net-next] xen-netback: xenbus.c: use more current logging styles

[David Miller]

From: Wei Liu <wei.liu2@citrix.com>
Date: Tue, 2 Jul 2013 00:08:54 +0100

> 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>

Applied, thanks.