Virtualization - Mar 2013 - [PATCH 1/2] virtio-scsi: use pr_err() instead of printk()

Convert the virtio-scsi driver to use pr_err() instead of printk().

Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com>
---
 drivers/scsi/virtio_scsi.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index 612e320..f679b8c 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -13,6 +13,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/mempool.h>
@@ -771,8 +773,7 @@ static int __init init(void)
 
 	virtscsi_cmd_cache = KMEM_CACHE(virtio_scsi_cmd, 0);
 	if (!virtscsi_cmd_cache) {
-		printk(KERN_ERR "kmem_cache_create() for "
-				"virtscsi_cmd_cache failed\n");
+		pr_err("kmem_cache_create() for virtscsi_cmd_cache failed\n");
 		goto error;
 	}
 
@@ -781,8 +782,7 @@ static int __init init(void)
 		mempool_create_slab_pool(VIRTIO_SCSI_MEMPOOL_SZ,
 					 virtscsi_cmd_cache);
 	if (!virtscsi_cmd_pool) {
-		printk(KERN_ERR "mempool_create() for"
-				"virtscsi_cmd_pool failed\n");
+		pr_err("mempool_create() for virtscsi_cmd_pool failed\n");
 		goto error;
 	}
 	ret = register_virtio_driver(&virtio_scsi_driver);
-- 
1.8.2.rc2

Reorder the goto label in init() to make it more clearly, and remove
the useless NULL pointer reassignment.

Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com>
---
 drivers/scsi/virtio_scsi.c | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index f679b8c..55dfb06 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -774,32 +774,27 @@ static int __init init(void)
 	virtscsi_cmd_cache = KMEM_CACHE(virtio_scsi_cmd, 0);
 	if (!virtscsi_cmd_cache) {
 		pr_err("kmem_cache_create() for virtscsi_cmd_cache failed\n");
-		goto error;
+		return ret;
 	}
 
-
-	virtscsi_cmd_pool -		mempool_create_slab_pool(VIRTIO_SCSI_MEMPOOL_SZ,
-					 virtscsi_cmd_cache);
+	virtscsi_cmd_pool = mempool_create_slab_pool(VIRTIO_SCSI_MEMPOOL_SZ,
+						     virtscsi_cmd_cache);
 	if (!virtscsi_cmd_pool) {
 		pr_err("mempool_create() for virtscsi_cmd_pool failed\n");
-		goto error;
+		goto out_destroy_cache;
 	}
+
 	ret = register_virtio_driver(&virtio_scsi_driver);
 	if (ret < 0)
-		goto error;
+		goto out_destroy_pool;
 
 	return 0;
 
-error:
-	if (virtscsi_cmd_pool) {
-		mempool_destroy(virtscsi_cmd_pool);
-		virtscsi_cmd_pool = NULL;
-	}
-	if (virtscsi_cmd_cache) {
-		kmem_cache_destroy(virtscsi_cmd_cache);
-		virtscsi_cmd_cache = NULL;
-	}
+out_destroy_pool:
+	mempool_destroy(virtscsi_cmd_pool);
+out_destroy_cache:
+	kmem_cache_destroy(virtscsi_cmd_cache);
+
 	return ret;
 }
 
-- 
1.8.2.rc2

Il 07/03/2013 04:29, Wanlong Gao ha scritto:
> Convert the virtio-scsi driver to use pr_err() instead of printk().
> 
> Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com>
Acked-by: Paolo Bonzini <pbonzini at redhat.com>

to this patch only.  For the other it's a matter of taste, and since
this is not a fast path it's easier to have a single label to bail out
out.  If you want to change it to "out", that's fine.

Paolo
> ---
>  drivers/scsi/virtio_scsi.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
> index 612e320..f679b8c 100644
> --- a/drivers/scsi/virtio_scsi.c
> +++ b/drivers/scsi/virtio_scsi.c
> @@ -13,6 +13,8 @@
>   *
>   */
>  
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
>  #include <linux/module.h>
>  #include <linux/slab.h>
>  #include <linux/mempool.h>
> @@ -771,8 +773,7 @@ static int __init init(void)
>  
>  	virtscsi_cmd_cache = KMEM_CACHE(virtio_scsi_cmd, 0);
>  	if (!virtscsi_cmd_cache) {
> -		printk(KERN_ERR "kmem_cache_create() for "
> -				"virtscsi_cmd_cache failed\n");
> +		pr_err("kmem_cache_create() for virtscsi_cmd_cache failed\n");
>  		goto error;
>  	}
>  
> @@ -781,8 +782,7 @@ static int __init init(void)
>  		mempool_create_slab_pool(VIRTIO_SCSI_MEMPOOL_SZ,
>  					 virtscsi_cmd_cache);
>  	if (!virtscsi_cmd_pool) {
> -		printk(KERN_ERR "mempool_create() for"
> -				"virtscsi_cmd_pool failed\n");
> +		pr_err("mempool_create() for virtscsi_cmd_pool failed\n");
>  		goto error;
>  	}
>  	ret = register_virtio_driver(&virtio_scsi_driver);
>

Paolo Bonzini <pbonzini at redhat.com> writes:
> Il 07/03/2013 04:29, Wanlong Gao ha scritto:
>> Convert the virtio-scsi driver to use pr_err() instead of printk().
>> 
>> Signed-off-by: Wanlong Gao <gaowanlong at cn.fujitsu.com>
>
> Acked-by: Paolo Bonzini <pbonzini at redhat.com>
Thanks, applied.

Cheers,
Rusty.