[PATCH 11/49] drivers/staging/dst: Convert printks to pr_<level>

[Joe Perches <joe@xxxxxxxxxxx>]

Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
 drivers/staging/dst/dcore.c  |   10 +++++-----
 drivers/staging/dst/export.c |    3 +--
 drivers/staging/dst/state.c  |    4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/dst/dcore.c b/drivers/staging/dst/dcore.c
index c24e4e0..967d986 100644
--- a/drivers/staging/dst/dcore.c
+++ b/drivers/staging/dst/dcore.c
@@ -179,7 +179,7 @@ static int dst_node_create_disk(struct dst_node *n)
 		goto err_out_free_queue;
 
 	if (!(n->state->permissions & DST_PERM_WRITE)) {
-		printk(KERN_INFO "DST node %s attached read-only.\n", n->name);
+		pr_info("DST node %s attached read-only.\n", n->name);
 		set_disk_ro(n->disk, 1);
 	}
 
@@ -713,8 +713,8 @@ err_out_free:
 
 static int dst_node_remove_unload(struct dst_node *n)
 {
-	printk(KERN_INFO "STOPPED name: '%s', size: %llu.\n",
-			n->name, n->size);
+	pr_info("STOPPED name: '%s', size: %llu.\n",
+		n->name, n->size);
 
 	if (n->disk)
 		del_gendisk(n->disk);
@@ -825,7 +825,7 @@ static int dst_start_node(struct dst_node *n, struct dst_ctl *ctl,
 	if (err)
 		return err;
 
-	printk(KERN_INFO "STARTED name: '%s', size: %llu.\n", n->name, n->size);
+	pr_info("STARTED name: '%s', size: %llu.\n", n->name, n->size);
 	return 0;
 }
 
@@ -967,7 +967,7 @@ static int __init dst_sys_init(void)
 	if (err)
 		goto err_out_sysfs_exit;
 
-	printk(KERN_INFO "Distributed storage, '%s' release.\n", dst_name);
+	pr_info("Distributed storage, '%s' release.\n", dst_name);
 
 	return 0;
 
diff --git a/drivers/staging/dst/export.c b/drivers/staging/dst/export.c
index 4fbd848..c4d54ba 100644
--- a/drivers/staging/dst/export.c
+++ b/drivers/staging/dst/export.c
@@ -341,8 +341,7 @@ static int dst_accept(void *init_data, void *schedule_data)
 int dst_start_export(struct dst_node *n)
 {
 	if (list_empty(&n->security_list)) {
-		printk(KERN_ERR "You are trying to export node '%s' without security attributes.\n"
-				"No clients will be allowed to connect. Exiting.\n", n->name);
+		pr_err("You are trying to export node '%s' without security attributes.\nNo clients will be allowed to connect. Exiting.\n", n->name);
 		return -EINVAL;
 	}
 	return dst_node_trans_init(n, sizeof(struct dst_export_priv));
diff --git a/drivers/staging/dst/state.c b/drivers/staging/dst/state.c
index d057e52..77a06d7 100644
--- a/drivers/staging/dst/state.c
+++ b/drivers/staging/dst/state.c
@@ -217,11 +217,11 @@ void dst_dump_addr(struct socket *sk, struct sockaddr *sa, char *str)
 {
 	if (sk->ops->family == AF_INET) {
 		struct sockaddr_in *sin = (struct sockaddr_in *)sa;
-		printk(KERN_INFO "%s %u.%u.%u.%u:%d.\n",
+		pr_info("%s %u.%u.%u.%u:%d.\n",
 			str, NIPQUAD(sin->sin_addr.s_addr), ntohs(sin->sin_port));
 	} else if (sk->ops->family == AF_INET6) {
 		struct sockaddr_in6 *sin = (struct sockaddr_in6 *)sa;
-		printk(KERN_INFO "%s %pi6:%d",
+		pr_info("%s %pi6:%d",
 			str, &sin->sin6_addr, ntohs(sin->sin6_port));
 	}
 }
-- 
1.6.5.rc3.dirty

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel