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, 10 insertions, 10 deletions

diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index cc863044c880..24e9fbb80e81 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -60,12 +60,12 @@ void ir_lirc_raw_event(struct rc_dev *dev, struct ir_raw_event ev)
                  * space with the maximum time value.
                  */
                 sample = LIRC_SPACE(LIRC_VALUE_MASK);
-                IR_dprintk(2, "delivering reset sync space to lirc_dev\n");
+                dev_dbg(&dev->dev, "delivering reset sync space to lirc_dev\n");
 
         /* Carrier reports */
         } else if (ev.carrier_report) {
                 sample = LIRC_FREQUENCY(ev.carrier);
-                IR_dprintk(2, "carrier report (freq: %d)\n", sample);
+                dev_dbg(&dev->dev, "carrier report (freq: %d)\n", sample);
 
         /* Packet end */
         } else if (ev.timeout) {
@@ -77,7 +77,7 @@ void ir_lirc_raw_event(struct rc_dev *dev, struct ir_raw_event ev)
                 dev->gap_duration = ev.duration;
 
                 sample = LIRC_TIMEOUT(ev.duration / 1000);
-                IR_dprintk(2, "timeout report (duration: %d)\n", sample);
+                dev_dbg(&dev->dev, "timeout report (duration: %d)\n", sample);
 
         /* Normal sample */
         } else {
@@ -100,8 +100,8 @@ void ir_lirc_raw_event(struct rc_dev *dev, struct ir_raw_event ev)
 
                 sample = ev.pulse ? LIRC_PULSE(ev.duration / 1000) :
                                         LIRC_SPACE(ev.duration / 1000);
-                IR_dprintk(2, "delivering %uus %s to lirc_dev\n",
-                           TO_US(ev.duration), TO_STR(ev.pulse));
+                dev_dbg(&dev->dev, "delivering %uus %s to lirc_dev\n",
+                        TO_US(ev.duration), TO_STR(ev.pulse));
         }
 
         spin_lock_irqsave(&dev->lirc_fh_lock, flags);
@@ -249,8 +249,6 @@ static ssize_t ir_lirc_transmit_ir(struct file *file, const char __user *buf,
                 goto out_unlock;
         }
 
-        start = ktime_get();
-
         if (!dev->tx_ir) {
                 ret = -EINVAL;
                 goto out_unlock;
@@ -343,6 +341,8 @@ static ssize_t ir_lirc_transmit_ir(struct file *file, const char __user *buf,
                 duration += txbuf[i];
         }
 
+        start = ktime_get();
+
         ret = dev->tx_ir(dev, txbuf, count);
         if (ret < 0)
                 goto out_kfree;
@@ -570,7 +570,7 @@ static long ir_lirc_ioctl(struct file *file, unsigned int cmd,
                                 ret = -EINVAL;
                         else if (dev->s_timeout)
                                 ret = dev->s_timeout(dev, tmp);
-                        else if (!ret)
+                        else
                                 dev->timeout = tmp;
                 }
                 break;
@@ -804,8 +804,8 @@ int __init lirc_dev_init(void)
                 return retval;
         }
 
-        pr_info("IR Remote Control driver registered, major %d\n",
-                                                MAJOR(lirc_base_dev));
+        pr_debug("IR Remote Control driver registered, major %d\n",
+                 MAJOR(lirc_base_dev));
 
         return 0;
 }