diff options
| author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2015-06-18 18:33:47 +0530 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2015-08-10 08:37:28 +0200 |
| commit | 20226118bceed7b432f4bc5bae34c1c160689bf7 (patch) | |
| tree | 7fd3773e7d8160aea693d515e25300406d549c80 /drivers/i2c | |
| parent | c5f3d544a7f29b16de37c10f51b38c4b7ad31804 (diff) | |
i2c: parport: start using pr_fmt
Start using pr_fmt and convert all remaining printk to use
pr_* family of macros.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
[wsa: remove print on kzalloc failure]
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-parport.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c index 3794f7d18442..a8e54df4aed6 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,26 +178,24 @@ 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"); + if (!adapter) return; - } memset(&i2c_parport_cb, 0, sizeof(i2c_parport_cb)); i2c_parport_cb.flags = PARPORT_FLAG_EXCL; 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 +299,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; } |