diff options
| author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-12-15 08:38:35 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-12-15 08:38:35 -0200 |
| commit | 65390ea01ce678379da32b01f39fcfac4903f256 (patch) | |
| tree | 7f849d66121533c331cf61136b124218d87cbf86 /drivers/media/pci/cx23885/cimax2.c | |
| parent | e7aa8c2eb11ba69b1b69099c3c7bd6be3087b0ba (diff) | |
| parent | d183e4efcae8d88a2f252e546978658ca6d273cc (diff) | |
Merge branch 'patchwork' into v4l_for_linus
* patchwork: (496 commits)
[media] v4l: tvp5150: Add missing break in set control handler
[media] v4l: tvp5150: Don't inline the tvp5150_selmux() function
[media] v4l: tvp5150: Compile tvp5150_link_setup out if !CONFIG_MEDIA_CONTROLLER
[media] em28xx: don't store usb_device at struct em28xx
[media] em28xx: use usb_interface for dev_foo() calls
[media] em28xx: don't change the device's name
[media] mn88472: fix chip id check on probe
[media] mn88473: fix chip id check on probe
[media] lirc: fix error paths in lirc_cdev_add()
[media] s5p-mfc: Add support for MFC v8 available in Exynos 5433 SoCs
[media] s5p-mfc: Rework clock handling
[media] s5p-mfc: Don't keep clock prepared all the time
[media] s5p-mfc: Kill all IS_ERR_OR_NULL in clocks management code
[media] s5p-mfc: Remove dead conditional code
[media] s5p-mfc: Ensure that clock is disabled before turning power off
[media] s5p-mfc: Remove special clock rate management
[media] s5p-mfc: Use printk_ratelimited for reporting ioctl errors
[media] s5p-mfc: Set DMA_ATTR_ALLOC_SINGLE_PAGES
[media] vivid: Set color_enc on HSV formats
[media] v4l2-tpg: Init hv_enc field with a valid value
...
Diffstat (limited to 'drivers/media/pci/cx23885/cimax2.c')
| -rw-r--r-- | drivers/media/pci/cx23885/cimax2.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/media/pci/cx23885/cimax2.c b/drivers/media/pci/cx23885/cimax2.c index 631e4f24aea6..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; } @@ -365,11 +365,8 @@ static void netup_read_ci_status(struct work_struct *work) if (ret != 0) return; - ci_dbg_print("%s: Slot Status Addr=[0x%04x], " - "Reg=[0x%02x], data=%02x, " - "TS config = %02x\n", __func__, - state->ci_i2c_addr, 0, buf[0], - buf[0]); + ci_dbg_print("%s: Slot Status Addr=[0x%04x], Reg=[0x%02x], data=%02x, TS config = %02x\n", + __func__, state->ci_i2c_addr, 0, buf[0], buf[0]); if (buf[0] & 1) |