diff mbox

[2/2] i2c-parport: start using pr_fmt

Message ID 1434632627-18955-2-git-send-email-sudipm.mukherjee@gmail.com
State Accepted
Headers show

Commit Message

Sudip Mukherjee June 18, 2015, 1:03 p.m. UTC 
Start using pr_fmt and convert all remaining printk to use
pr_* family of macros.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
 drivers/i2c/busses/i2c-parport.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Comments

Wolfram Sang July 9, 2015, 8:04 p.m. UTC | #1 
On Thu, Jun 18, 2015 at 06:33:47PM +0530, Sudip Mukherjee wrote:
> Start using pr_fmt and convert all remaining printk to use
> pr_* family of macros.
> 
> Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>

Applied to for-next, thanks!

One modification:

>  	adapter = kzalloc(sizeof(struct i2c_par), GFP_KERNEL);
>  	if (adapter == NULL) {
> -		printk(KERN_ERR "i2c-parport: Failed to kzalloc\n");
> +		pr_err("Failed to kzalloc\n");

I removed this printout, since we get a dump in this case anyhow.
diff mbox

Patch

diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c
index 3794f7d..881fe32 100644
--- a/drivers/i2c/busses/i2c-parport.c
+++ b/drivers/i2c/busses/i2c-parport.c
@@ -20,6 +20,8 @@ 
    GNU General Public License for more details.
  * ------------------------------------------------------------------------ */
 
+#define pr_fmt(fmt) "i2c-parport: " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -176,13 +178,13 @@  static void i2c_parport_attach(struct parport *port)
 			break;
 	}
 	if (i == MAX_DEVICE) {
-		pr_debug("i2c-parport: Not using parport%d.\n", port->number);
+		pr_debug("Not using parport%d.\n", port->number);
 		return;
 	}
 
 	adapter = kzalloc(sizeof(struct i2c_par), GFP_KERNEL);
 	if (adapter == NULL) {
-		printk(KERN_ERR "i2c-parport: Failed to kzalloc\n");
+		pr_err("Failed to kzalloc\n");
 		return;
 	}
 	memset(&i2c_parport_cb, 0, sizeof(i2c_parport_cb));
@@ -190,12 +192,12 @@  static void i2c_parport_attach(struct parport *port)
 	i2c_parport_cb.irq_func = i2c_parport_irq;
 	i2c_parport_cb.private = adapter;
 
-	pr_debug("i2c-parport: attaching to %s\n", port->name);
+	pr_debug("attaching to %s\n", port->name);
 	parport_disable_irq(port);
 	adapter->pdev = parport_register_dev_model(port, "i2c-parport",
 						   &i2c_parport_cb, i);
 	if (!adapter->pdev) {
-		printk(KERN_ERR "i2c-parport: Unable to register with parport\n");
+		pr_err("Unable to register with parport\n");
 		goto err_free;
 	}
 
@@ -299,12 +301,12 @@  static struct parport_driver i2c_parport_driver = {
 static int __init i2c_parport_init(void)
 {
 	if (type < 0) {
-		printk(KERN_WARNING "i2c-parport: adapter type unspecified\n");
+		pr_warn("adapter type unspecified\n");
 		return -ENODEV;
 	}
 
 	if (type >= ARRAY_SIZE(adapter_parm)) {
-		printk(KERN_WARNING "i2c-parport: invalid type (%d)\n", type);
+		pr_warn("invalid type (%d)\n", type);
 		return -ENODEV;
 	}