summaryrefslogtreecommitdiff
path: root/drivers/media/pci/cx23885/cimax2.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-11-13 09:46:11 -0200
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-11-18 08:09:36 -0200
commite39682b5d96ae7a33a0f6b5578911913be8f14b6 (patch)
treeb7aa9b903756aca9e874e132e0a604e307ef71b0 /drivers/media/pci/cx23885/cimax2.c
parentf1dc10b6e18df849429c1625bbcdf04ecc25d5c3 (diff)
[media] cx23885: convert it to use pr_foo() macros
Instead of calling printk() directly, use pr_foo() macros, as suggested at the Kernel's coding style. Please notice that a conversion to dev_foo() is not trivial, as several parts on this driver uses pr_cont(). Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/pci/cx23885/cimax2.c')
-rw-r--r--drivers/media/pci/cx23885/cimax2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/pci/cx23885/cimax2.c b/drivers/media/pci/cx23885/cimax2.c
index d644c65622e2..5e8e134d81c2 100644
--- a/drivers/media/pci/cx23885/cimax2.c
+++ b/drivers/media/pci/cx23885/cimax2.c
@@ -65,10 +65,11 @@ static unsigned int ci_irq_enable;
module_param(ci_irq_enable, int, 0644);
MODULE_PARM_DESC(ci_irq_enable, "Enable IRQ from CAM");
-#define ci_dbg_print(args...) \
+#define ci_dbg_print(fmt, args...) \
do { \
if (ci_dbg) \
- printk(KERN_DEBUG args); \
+ printk(KERN_DEBUG pr_fmt("%s: " fmt), \
+ __func__, ##args); \
} while (0)
#define ci_irq_flags() (ci_irq_enable ? NETUP_IRQ_IRQAM : 0)
@@ -135,8 +136,7 @@ static int netup_write_i2c(struct i2c_adapter *i2c_adap, u8 addr, u8 reg,
};
if (1 + len > sizeof(buffer)) {
- printk(KERN_WARNING
- "%s: i2c wr reg=%04x: len=%d is too big!\n",
+ pr_warn("%s: i2c wr reg=%04x: len=%d is too big!\n",
KBUILD_MODNAME, reg, len);
return -EINVAL;
}