[PATCH 23/49] drivers/staging/panel: Convert printks to pr_<level>

[Joe Perches <joe@xxxxxxxxxxx>]

Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
 drivers/staging/panel/panel.c |   28 ++++++++++++----------------
 1 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index dd7d3fd..8c93cb3 100644
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@ -1909,7 +1909,7 @@ static struct logical_input *panel_bind_key(char *name, char *press,
 
 	key = kmalloc(sizeof(struct logical_input), GFP_KERNEL);
 	if (!key) {
-		printk(KERN_ERR "panel: not enough memory\n");
+		pr_err("panel: not enough memory\n");
 		return NULL;
 	}
 	memset(key, 0, sizeof(struct logical_input));
@@ -1950,7 +1950,7 @@ static struct logical_input *panel_bind_callback(char *name,
 
 	callback = kmalloc(sizeof(struct logical_input), GFP_KERNEL);
 	if (!callback) {
-		printk(KERN_ERR "panel: not enough memory\n");
+		pr_err("panel: not enough memory\n");
 		return NULL;
 	}
 	memset(callback, 0, sizeof(struct logical_input));
@@ -2029,8 +2029,7 @@ static void panel_attach(struct parport *port)
 		return;
 
 	if (pprt) {
-		printk(KERN_ERR
-		       "panel_attach(): port->number=%d parport=%d, already registered !\n",
+		pr_err("panel_attach(): port->number=%d parport=%d, already registered !\n",
 		       port->number, parport);
 		return;
 	}
@@ -2041,8 +2040,7 @@ static void panel_attach(struct parport *port)
 				       0, (void *)&pprt);
 
 	if (parport_claim(pprt)) {
-		printk(KERN_ERR
-		       "Panel: could not claim access to parport%d. Aborting.\n",
+		pr_err("Panel: could not claim access to parport%d. Aborting.\n",
 		       parport);
 		return;
 	}
@@ -2065,8 +2063,7 @@ static void panel_detach(struct parport *port)
 		return;
 
 	if (!pprt) {
-		printk(KERN_ERR
-		       "panel_detach(): port->number=%d parport=%d, nothing to unregister.\n",
+		pr_err("panel_detach(): port->number=%d parport=%d, nothing to unregister.\n",
 		       port->number, parport);
 		return;
 	}
@@ -2167,8 +2164,7 @@ int panel_init(void)
 	init_in_progress = 1;
 
 	if (parport_register_driver(&panel_driver)) {
-		printk(KERN_ERR
-		       "Panel: could not register with parport. Aborting.\n");
+		pr_err("Panel: could not register with parport. Aborting.\n");
 		return -EIO;
 	}
 
@@ -2179,7 +2175,7 @@ int panel_init(void)
 			parport_unregister_device(pprt);
 		}
 		parport_unregister_driver(&panel_driver);
-		printk(KERN_ERR "Panel driver version " PANEL_VERSION
+		pr_err("Panel driver version " PANEL_VERSION
 		       " disabled.\n");
 		return -ENODEV;
 	}
@@ -2187,12 +2183,12 @@ int panel_init(void)
 	register_reboot_notifier(&panel_notifier);
 
 	if (pprt)
-		printk(KERN_INFO "Panel driver version " PANEL_VERSION
-		       " registered on parport%d (io=0x%lx).\n", parport,
-		       pprt->port->base);
+		pr_info("Panel driver version " PANEL_VERSION
+			" registered on parport%d (io=0x%lx).\n", parport,
+			pprt->port->base);
 	else
-		printk(KERN_INFO "Panel driver version " PANEL_VERSION
-		       " not yet registered\n");
+		pr_info("Panel driver version " PANEL_VERSION
+			" not yet registered\n");
 	/* tells various subsystems about the fact that initialization is finished */
 	init_in_progress = 0;
 	return 0;
-- 
1.6.5.rc3.dirty

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