Merge tag 'media/v4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:

 - new CEC pin injection code for testing purposes

 - DVB frontend cxd2099 promoted from staging

 - new platform driver for Sony cxd2880 DVB devices

 - new sensor drivers: mt9t112, ov2685, ov5695, ov772x, tda1997x,
   tw9910.c

 - removal of unused cx18 and ivtv alsa mixers

 - the reneseas-ceu driver doesn't depend on soc_camera anymore and
   moved from staging

 - removed the mantis_vp3028 driver, unused since 2009

 - s5p-mfc: add support for version 10 of the MSP

 - added a decoder for imon protocol

 - atomisp: lots of cleanups

 - imx074 and mt9t031: don't depend on soc_camera anymore, being
   promoted from staging

 - added helper functions to better support DVB I2C binding

 - lots of driver improvements and cleanups

* tag 'media/v4.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (438 commits)
  media: v4l2-ioctl: rename a temp var that stores _IOC_SIZE(cmd)
  media: fimc-capture: get rid of two warnings
  media: dvb-usb-v2: fix a missing dependency of I2C_MUX
  media: uvc: to the right check at uvc_ioctl_enum_framesizes()
  media: cec-core: fix a bug at cec_error_inj_write()
  media: tda9840: cleanup a warning
  media: tm6000:  avoid casting just to print pointer address
  media: em28xx-input: improve error handling code
  media: zr364xx: avoid casting just to print pointer address
  media: vivid-radio-rx: add a cast to avoid a warning
  media: saa7134-alsa: don't use casts to print a buffer address
  media: solo6x10: get rid of an address space warning
  media: zoran: don't cast pointers to print them
  media: ir-kbd-i2c: change the if logic to avoid a warning
  media: ir-kbd-i2c: improve error handling code
  media: saa7134-input: improve error handling
  media: s2255drv: fix a casting warning
  media: ivtvfb: Cleanup some warnings
  media: videobuf-dma-sg: Fix a weird cast
  soc_camera: fix a weird cast on printk
  ...

1 files changed, 8 insertions, 9 deletions

diff --git a/drivers/media/rc/ir-sharp-decoder.c b/drivers/media/rc/ir-sharp-decoder.c
index df296991906c..6a38c50566a4 100644
--- a/drivers/media/rc/ir-sharp-decoder.c
+++ b/drivers/media/rc/ir-sharp-decoder.c
@@ -54,8 +54,8 @@ static int ir_sharp_decode(struct rc_dev *dev, struct ir_raw_event ev)
                 return 0;
         }
 
-        IR_dprintk(2, "Sharp decode started at state %d (%uus %s)\n",
-                   data->state, TO_US(ev.duration), TO_STR(ev.pulse));
+        dev_dbg(&dev->dev, "Sharp decode started at state %d (%uus %s)\n",
+                data->state, TO_US(ev.duration), TO_STR(ev.pulse));
 
         switch (data->state) {
 
@@ -149,9 +149,9 @@ static int ir_sharp_decode(struct rc_dev *dev, struct ir_raw_event ev)
                 msg = (data->bits >> 15) & 0x7fff;
                 echo = data->bits & 0x7fff;
                 if ((msg ^ echo) != 0x3ff) {
-                        IR_dprintk(1,
-                                   "Sharp checksum error: received 0x%04x, 0x%04x\n",
-                                   msg, echo);
+                        dev_dbg(&dev->dev,
+                                "Sharp checksum error: received 0x%04x, 0x%04x\n",
+                                msg, echo);
                         break;
                 }
 
@@ -159,16 +159,15 @@ static int ir_sharp_decode(struct rc_dev *dev, struct ir_raw_event ev)
                 command = bitrev8((msg >> 2) & 0xff);
 
                 scancode = address << 8 | command;
-                IR_dprintk(1, "Sharp scancode 0x%04x\n", scancode);
+                dev_dbg(&dev->dev, "Sharp scancode 0x%04x\n", scancode);
 
                 rc_keydown(dev, RC_PROTO_SHARP, scancode, 0);
                 data->state = STATE_INACTIVE;
                 return 0;
         }
 
-        IR_dprintk(1, "Sharp decode failed at count %d state %d (%uus %s)\n",
-                   data->count, data->state, TO_US(ev.duration),
-                   TO_STR(ev.pulse));
+        dev_dbg(&dev->dev, "Sharp decode failed at count %d state %d (%uus %s)\n",
+                data->count, data->state, TO_US(ev.duration), TO_STR(ev.pulse));
         data->state = STATE_INACTIVE;
         return -EINVAL;
 }