Merge tag 'media/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:

 - new IR driver: hix5hd2-ir

 - the virtual test driver (vivi) was replaced by vivid, with has an
   almost complete set of features to emulate most v4l2 devices and
   properly test all sorts of userspace apps

 - the as102 driver had several bugs fixed and was properly split into a
   frontend and a core driver.  With that, it got promoted from staging
   into mainstream

 - one new CI driver got added for CIMaX SP2/SP2HF (sp2 driver)

 - one new frontend driver for Toshiba ISDB-T/ISDB-S demod (tc90522)

 - one new PCI driver for ISDB-T/ISDB-S (pt3 driver)

 - saa7134 driver got support for go7007-based devices

 - added a new PCI driver for Techwell 68xx chipsets (tw68)

 - a new platform driver was added (coda)

 - new tuner drivers: mxl301rf and qm1d1c0042

 - a new DVB USB driver was added for DVBSky S860 & similar devices

 - added a new SDR driver (hackrf)

 - usbtv got audio support

 - several platform drivers are now compiled with COMPILE_TEST

 - a series of compiler fixup patches, making sparse/spatch happier with
   the media stuff and removing several warnings, especially on those
   platform drivers that didn't use to compile on x86

 - Support for several new modern devices got added

 - lots of other fixes, improvements and cleanups

* tag 'media/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (544 commits)
  [media] ir-hix5hd2: fix build on c6x arch
  [media] pt3: fix DTV FE I2C driver load error paths
  Revert "[media] media: em28xx - remove reset_resume interface"
  [media] exynos4-is: fix some warnings when compiling on arm64
  [media] usb drivers: use %zu instead of %zd
  [media] pci drivers: use %zu instead of %zd
  [media] dvb-frontends: use %zu instead of %zd
  [media] s5p-mfc: Fix several printk warnings
  [media] s5p_mfc_opr: Fix warnings
  [media] ti-vpe: Fix typecast
  [media] s3c-camif: fix dma_addr_t printks
  [media] s5p_mfc_opr_v6: get rid of warnings when compiled with 64 bits
  [media] s5p_mfc_opr_v5: Fix lots of warnings on x86_64
  [media] em28xx: Fix identation
  [media] drxd: remove a dead code
  [media] saa7146: remove return after BUG()
  [media] cx88: remove return after BUG()
  [media] cx88: fix cards table CodingStyle
  [media] radio-sf16fmr2: declare some structs as static
  [media] radio-sf16fmi: declare pnp_attached as static
  ...

1 files changed, 56 insertions, 62 deletions

diff --git a/drivers/media/dvb-frontends/rtl2832_sdr.c b/drivers/media/dvb-frontends/rtl2832_sdr.c
index 023e0f49c786..7bf98cf6bbe1 100644
--- a/drivers/media/dvb-frontends/rtl2832_sdr.c
+++ b/drivers/media/dvb-frontends/rtl2832_sdr.c
@@ -329,7 +329,7 @@ static int rtl2832_sdr_rd_reg_mask(struct rtl2832_sdr_state *s, u16 reg,
 static struct rtl2832_sdr_frame_buf *rtl2832_sdr_get_next_fill_buf(
                 struct rtl2832_sdr_state *s)
 {
-        unsigned long flags = 0;
+        unsigned long flags;
         struct rtl2832_sdr_frame_buf *buf = NULL;
 
         spin_lock_irqsave(&s->queued_bufs_lock, flags);
@@ -365,17 +365,19 @@ static unsigned int rtl2832_sdr_convert_stream(struct rtl2832_sdr_state *s,
                 dst_len = 0;
         }
 
-        /* calculate samping rate and output it in 10 seconds intervals */
+        /* calculate sample rate and output it in 10 seconds intervals */
         if (unlikely(time_is_before_jiffies(s->jiffies_next))) {
-#define MSECS 10000UL
+                #define MSECS 10000UL
+                unsigned int msecs = jiffies_to_msecs(jiffies -
+                                s->jiffies_next + msecs_to_jiffies(MSECS));
                 unsigned int samples = s->sample - s->sample_measured;
 
                 s->jiffies_next = jiffies + msecs_to_jiffies(MSECS);
                 s->sample_measured = s->sample;
                 dev_dbg(&s->udev->dev,
-                                "slen=%d samples=%u msecs=%lu sampling rate=%lu\n",
-                                src_len, samples, MSECS,
-                                samples * 1000UL / MSECS);
+                                "slen=%u samples=%u msecs=%u sample rate=%lu\n",
+                                src_len, samples, msecs,
+                                samples * 1000UL / msecs);
         }
 
         /* total number of I+Q pairs */
@@ -394,8 +396,8 @@ static void rtl2832_sdr_urb_complete(struct urb *urb)
         struct rtl2832_sdr_frame_buf *fbuf;
 
         dev_dbg_ratelimited(&s->udev->dev,
-                        "%s: status=%d length=%d/%d errors=%d\n",
-                        __func__, urb->status, urb->actual_length,
+                        "status=%d length=%d/%d errors=%d\n",
+                        urb->status, urb->actual_length,
                         urb->transfer_buffer_length, urb->error_count);
 
         switch (urb->status) {
@@ -443,7 +445,7 @@ static int rtl2832_sdr_kill_urbs(struct rtl2832_sdr_state *s)
         int i;
 
         for (i = s->urbs_submitted - 1; i >= 0; i--) {
-                dev_dbg(&s->udev->dev, "%s: kill urb=%d\n", __func__, i);
+                dev_dbg(&s->udev->dev, "kill urb=%d\n", i);
                 /* stop the URB */
                 usb_kill_urb(s->urb_list[i]);
         }
@@ -457,7 +459,7 @@ static int rtl2832_sdr_submit_urbs(struct rtl2832_sdr_state *s)
         int i, ret;
 
         for (i = 0; i < s->urbs_initialized; i++) {
-                dev_dbg(&s->udev->dev, "%s: submit urb=%d\n", __func__, i);
+                dev_dbg(&s->udev->dev, "submit urb=%d\n", i);
                 ret = usb_submit_urb(s->urb_list[i], GFP_ATOMIC);
                 if (ret) {
                         dev_err(&s->udev->dev,
@@ -477,8 +479,7 @@ static int rtl2832_sdr_free_stream_bufs(struct rtl2832_sdr_state *s)
         if (s->flags & USB_STATE_URB_BUF) {
                 while (s->buf_num) {
                         s->buf_num--;
-                        dev_dbg(&s->udev->dev, "%s: free buf=%d\n",
-                                        __func__, s->buf_num);
+                        dev_dbg(&s->udev->dev, "free buf=%d\n", s->buf_num);
                         usb_free_coherent(s->udev, s->buf_size,
                                           s->buf_list[s->buf_num],
                                           s->dma_addr[s->buf_num]);
@@ -494,24 +495,22 @@ static int rtl2832_sdr_alloc_stream_bufs(struct rtl2832_sdr_state *s)
         s->buf_num = 0;
         s->buf_size = BULK_BUFFER_SIZE;
 
-        dev_dbg(&s->udev->dev,
-                        "%s: all in all I will use %u bytes for streaming\n",
-                        __func__,  MAX_BULK_BUFS * BULK_BUFFER_SIZE);
+        dev_dbg(&s->udev->dev, "all in all I will use %u bytes for streaming\n",
+                        MAX_BULK_BUFS * BULK_BUFFER_SIZE);
 
         for (s->buf_num = 0; s->buf_num < MAX_BULK_BUFS; s->buf_num++) {
                 s->buf_list[s->buf_num] = usb_alloc_coherent(s->udev,
                                 BULK_BUFFER_SIZE, GFP_ATOMIC,
                                 &s->dma_addr[s->buf_num]);
                 if (!s->buf_list[s->buf_num]) {
-                        dev_dbg(&s->udev->dev, "%s: alloc buf=%d failed\n",
-                                        __func__, s->buf_num);
+                        dev_dbg(&s->udev->dev, "alloc buf=%d failed\n",
+                                        s->buf_num);
                         rtl2832_sdr_free_stream_bufs(s);
                         return -ENOMEM;
                 }
 
-                dev_dbg(&s->udev->dev, "%s: alloc buf=%d %p (dma %llu)\n",
-                                __func__, s->buf_num,
-                                s->buf_list[s->buf_num],
+                dev_dbg(&s->udev->dev, "alloc buf=%d %p (dma %llu)\n",
+                                s->buf_num, s->buf_list[s->buf_num],
                                 (long long)s->dma_addr[s->buf_num]);
                 s->flags |= USB_STATE_URB_BUF;
         }
@@ -527,8 +526,7 @@ static int rtl2832_sdr_free_urbs(struct rtl2832_sdr_state *s)
 
         for (i = s->urbs_initialized - 1; i >= 0; i--) {
                 if (s->urb_list[i]) {
-                        dev_dbg(&s->udev->dev, "%s: free urb=%d\n",
-                                        __func__, i);
+                        dev_dbg(&s->udev->dev, "free urb=%d\n", i);
                         /* free the URBs */
                         usb_free_urb(s->urb_list[i]);
                 }
@@ -544,10 +542,10 @@ static int rtl2832_sdr_alloc_urbs(struct rtl2832_sdr_state *s)
 
         /* allocate the URBs */
         for (i = 0; i < MAX_BULK_BUFS; i++) {
-                dev_dbg(&s->udev->dev, "%s: alloc urb=%d\n", __func__, i);
+                dev_dbg(&s->udev->dev, "alloc urb=%d\n", i);
                 s->urb_list[i] = usb_alloc_urb(0, GFP_ATOMIC);
                 if (!s->urb_list[i]) {
-                        dev_dbg(&s->udev->dev, "%s: failed\n", __func__);
+                        dev_dbg(&s->udev->dev, "failed\n");
                         for (j = 0; j < i; j++)
                                 usb_free_urb(s->urb_list[j]);
                         return -ENOMEM;
@@ -570,9 +568,9 @@ static int rtl2832_sdr_alloc_urbs(struct rtl2832_sdr_state *s)
 /* Must be called with vb_queue_lock hold */
 static void rtl2832_sdr_cleanup_queued_bufs(struct rtl2832_sdr_state *s)
 {
-        unsigned long flags = 0;
+        unsigned long flags;
 
-        dev_dbg(&s->udev->dev, "%s:\n", __func__);
+        dev_dbg(&s->udev->dev, "\n");
 
         spin_lock_irqsave(&s->queued_bufs_lock, flags);
         while (!list_empty(&s->queued_bufs)) {
@@ -591,7 +589,7 @@ static void rtl2832_sdr_release_sec(struct dvb_frontend *fe)
 {
         struct rtl2832_sdr_state *s = fe->sec_priv;
 
-        dev_dbg(&s->udev->dev, "%s:\n", __func__);
+        dev_dbg(&s->udev->dev, "\n");
 
         mutex_lock(&s->vb_queue_lock);
         mutex_lock(&s->v4l2_lock);
@@ -613,7 +611,7 @@ static int rtl2832_sdr_querycap(struct file *file, void *fh,
 {
         struct rtl2832_sdr_state *s = video_drvdata(file);
 
-        dev_dbg(&s->udev->dev, "%s:\n", __func__);
+        dev_dbg(&s->udev->dev, "\n");
 
         strlcpy(cap->driver, KBUILD_MODNAME, sizeof(cap->driver));
         strlcpy(cap->card, s->vdev.name, sizeof(cap->card));
@@ -631,15 +629,15 @@ static int rtl2832_sdr_queue_setup(struct vb2_queue *vq,
 {
         struct rtl2832_sdr_state *s = vb2_get_drv_priv(vq);
 
-        dev_dbg(&s->udev->dev, "%s: *nbuffers=%d\n", __func__, *nbuffers);
+        dev_dbg(&s->udev->dev, "nbuffers=%d\n", *nbuffers);
 
         /* Need at least 8 buffers */
         if (vq->num_buffers + *nbuffers < 8)
                 *nbuffers = 8 - vq->num_buffers;
         *nplanes = 1;
         sizes[0] = PAGE_ALIGN(s->buffersize);
-        dev_dbg(&s->udev->dev, "%s: nbuffers=%d sizes[0]=%d\n",
-                        __func__, *nbuffers, sizes[0]);
+        dev_dbg(&s->udev->dev, "nbuffers=%d sizes[0]=%d\n",
+                        *nbuffers, sizes[0]);
         return 0;
 }
 
@@ -659,7 +657,7 @@ static void rtl2832_sdr_buf_queue(struct vb2_buffer *vb)
         struct rtl2832_sdr_state *s = vb2_get_drv_priv(vb->vb2_queue);
         struct rtl2832_sdr_frame_buf *buf =
                         container_of(vb, struct rtl2832_sdr_frame_buf, vb);
-        unsigned long flags = 0;
+        unsigned long flags;
 
         /* Check the device has not disconnected between prep and queuing */
         if (!s->udev) {
@@ -681,7 +679,7 @@ static int rtl2832_sdr_set_adc(struct rtl2832_sdr_state *s)
         u64 u64tmp;
         u32 u32tmp;
 
-        dev_dbg(&s->udev->dev, "%s: f_adc=%u\n", __func__, s->f_adc);
+        dev_dbg(&s->udev->dev, "f_adc=%u\n", s->f_adc);
 
         if (!test_bit(POWER_ON, &s->flags))
                 return 0;
@@ -715,8 +713,7 @@ static int rtl2832_sdr_set_adc(struct rtl2832_sdr_state *s)
         u64tmp = -u64tmp;
         u32tmp = u64tmp & 0x3fffff;
 
-        dev_dbg(&s->udev->dev, "%s: f_if=%u if_ctl=%08x\n",
-                        __func__, f_if, u32tmp);
+        dev_dbg(&s->udev->dev, "f_if=%u if_ctl=%08x\n", f_if, u32tmp);
 
         buf[0] = (u32tmp >> 16) & 0xff;
         buf[1] = (u32tmp >>  8) & 0xff;
@@ -903,7 +900,7 @@ static void rtl2832_sdr_unset_adc(struct rtl2832_sdr_state *s)
 {
         int ret;
 
-        dev_dbg(&s->udev->dev, "%s:\n", __func__);
+        dev_dbg(&s->udev->dev, "\n");
 
         /* PID filter */
         ret = rtl2832_sdr_wr_regs(s, 0x061, "\xe0", 1);
@@ -964,8 +961,8 @@ static int rtl2832_sdr_set_tuner_freq(struct rtl2832_sdr_state *s)
         c->frequency = s->f_tuner;
         c->delivery_system = SYS_DVBT;
 
-        dev_dbg(&s->udev->dev, "%s: frequency=%u bandwidth=%d\n",
-                        __func__, c->frequency, c->bandwidth_hz);
+        dev_dbg(&s->udev->dev, "frequency=%u bandwidth=%d\n",
+                        c->frequency, c->bandwidth_hz);
 
         if (!test_bit(POWER_ON, &s->flags))
                 return 0;
@@ -980,7 +977,7 @@ static int rtl2832_sdr_set_tuner(struct rtl2832_sdr_state *s)
 {
         struct dvb_frontend *fe = s->fe;
 
-        dev_dbg(&s->udev->dev, "%s:\n", __func__);
+        dev_dbg(&s->udev->dev, "\n");
 
         if (fe->ops.tuner_ops.init)
                 fe->ops.tuner_ops.init(fe);
@@ -992,7 +989,7 @@ static void rtl2832_sdr_unset_tuner(struct rtl2832_sdr_state *s)
 {
         struct dvb_frontend *fe = s->fe;
 
-        dev_dbg(&s->udev->dev, "%s:\n", __func__);
+        dev_dbg(&s->udev->dev, "\n");
 
         if (fe->ops.tuner_ops.sleep)
                 fe->ops.tuner_ops.sleep(fe);
@@ -1005,7 +1002,7 @@ static int rtl2832_sdr_start_streaming(struct vb2_queue *vq, unsigned int count)
         struct rtl2832_sdr_state *s = vb2_get_drv_priv(vq);
         int ret;
 
-        dev_dbg(&s->udev->dev, "%s:\n", __func__);
+        dev_dbg(&s->udev->dev, "\n");
 
         if (!s->udev)
                 return -ENODEV;
@@ -1054,7 +1051,7 @@ static void rtl2832_sdr_stop_streaming(struct vb2_queue *vq)
 {
         struct rtl2832_sdr_state *s = vb2_get_drv_priv(vq);
 
-        dev_dbg(&s->udev->dev, "%s:\n", __func__);
+        dev_dbg(&s->udev->dev, "\n");
 
         mutex_lock(&s->v4l2_lock);
 
@@ -1088,8 +1085,7 @@ static int rtl2832_sdr_g_tuner(struct file *file, void *priv,
 {
         struct rtl2832_sdr_state *s = video_drvdata(file);
 
-        dev_dbg(&s->udev->dev, "%s: index=%d type=%d\n",
-                        __func__, v->index, v->type);
+        dev_dbg(&s->udev->dev, "index=%d type=%d\n", v->index, v->type);
 
         if (v->index == 0) {
                 strlcpy(v->name, "ADC: Realtek RTL2832", sizeof(v->name));
@@ -1115,7 +1111,7 @@ static int rtl2832_sdr_s_tuner(struct file *file, void *priv,
 {
         struct rtl2832_sdr_state *s = video_drvdata(file);
 
-        dev_dbg(&s->udev->dev, "%s:\n", __func__);
+        dev_dbg(&s->udev->dev, "\n");
 
         if (v->index > 1)
                 return -EINVAL;
@@ -1127,8 +1123,8 @@ static int rtl2832_sdr_enum_freq_bands(struct file *file, void *priv,
 {
         struct rtl2832_sdr_state *s = video_drvdata(file);
 
-        dev_dbg(&s->udev->dev, "%s: tuner=%d type=%d index=%d\n",
-                        __func__, band->tuner, band->type, band->index);
+        dev_dbg(&s->udev->dev, "tuner=%d type=%d index=%d\n",
+                        band->tuner, band->type, band->index);
 
         if (band->tuner == 0) {
                 if (band->index >= ARRAY_SIZE(bands_adc))
@@ -1153,8 +1149,8 @@ static int rtl2832_sdr_g_frequency(struct file *file, void *priv,
         struct rtl2832_sdr_state *s = video_drvdata(file);
         int ret  = 0;
 
-        dev_dbg(&s->udev->dev, "%s: tuner=%d type=%d\n",
-                        __func__, f->tuner, f->type);
+        dev_dbg(&s->udev->dev, "tuner=%d type=%d\n",
+                        f->tuner, f->type);
 
         if (f->tuner == 0) {
                 f->frequency = s->f_adc;
@@ -1175,8 +1171,8 @@ static int rtl2832_sdr_s_frequency(struct file *file, void *priv,
         struct rtl2832_sdr_state *s = video_drvdata(file);
         int ret, band;
 
-        dev_dbg(&s->udev->dev, "%s: tuner=%d type=%d frequency=%u\n",
-                        __func__, f->tuner, f->type, f->frequency);
+        dev_dbg(&s->udev->dev, "tuner=%d type=%d frequency=%u\n",
+                        f->tuner, f->type, f->frequency);
 
         /* ADC band midpoints */
         #define BAND_ADC_0 ((bands_adc[0].rangehigh + bands_adc[1].rangelow) / 2)
@@ -1194,15 +1190,13 @@ static int rtl2832_sdr_s_frequency(struct file *file, void *priv,
                                 bands_adc[band].rangelow,
                                 bands_adc[band].rangehigh);
 
-                dev_dbg(&s->udev->dev, "%s: ADC frequency=%u Hz\n",
-                                __func__, s->f_adc);
+                dev_dbg(&s->udev->dev, "ADC frequency=%u Hz\n", s->f_adc);
                 ret = rtl2832_sdr_set_adc(s);
         } else if (f->tuner == 1) {
                 s->f_tuner = clamp_t(unsigned int, f->frequency,
                                 bands_fm[0].rangelow,
                                 bands_fm[0].rangehigh);
-                dev_dbg(&s->udev->dev, "%s: RF frequency=%u Hz\n",
-                                __func__, f->frequency);
+                dev_dbg(&s->udev->dev, "RF frequency=%u Hz\n", f->frequency);
 
                 ret = rtl2832_sdr_set_tuner_freq(s);
         } else {
@@ -1217,7 +1211,7 @@ static int rtl2832_sdr_enum_fmt_sdr_cap(struct file *file, void *priv,
 {
         struct rtl2832_sdr_state *s = video_drvdata(file);
 
-        dev_dbg(&s->udev->dev, "%s:\n", __func__);
+        dev_dbg(&s->udev->dev, "\n");
 
         if (f->index >= s->num_formats)
                 return -EINVAL;
@@ -1233,7 +1227,7 @@ static int rtl2832_sdr_g_fmt_sdr_cap(struct file *file, void *priv,
 {
         struct rtl2832_sdr_state *s = video_drvdata(file);
 
-        dev_dbg(&s->udev->dev, "%s:\n", __func__);
+        dev_dbg(&s->udev->dev, "\n");
 
         f->fmt.sdr.pixelformat = s->pixelformat;
         f->fmt.sdr.buffersize = s->buffersize;
@@ -1250,7 +1244,7 @@ static int rtl2832_sdr_s_fmt_sdr_cap(struct file *file, void *priv,
         struct vb2_queue *q = &s->vb_queue;
         int i;
 
-        dev_dbg(&s->udev->dev, "%s: pixelformat fourcc %4.4s\n", __func__,
+        dev_dbg(&s->udev->dev, "pixelformat fourcc %4.4s\n",
                         (char *)&f->fmt.sdr.pixelformat);
 
         if (vb2_is_busy(q))
@@ -1280,7 +1274,7 @@ static int rtl2832_sdr_try_fmt_sdr_cap(struct file *file, void *priv,
         struct rtl2832_sdr_state *s = video_drvdata(file);
         int i;
 
-        dev_dbg(&s->udev->dev, "%s: pixelformat fourcc %4.4s\n", __func__,
+        dev_dbg(&s->udev->dev, "pixelformat fourcc %4.4s\n",
                         (char *)&f->fmt.sdr.pixelformat);
 
         memset(f->fmt.sdr.reserved, 0, sizeof(f->fmt.sdr.reserved));
@@ -1354,8 +1348,8 @@ static int rtl2832_sdr_s_ctrl(struct v4l2_ctrl *ctrl)
         int ret;
 
         dev_dbg(&s->udev->dev,
-                        "%s: id=%d name=%s val=%d min=%lld max=%lld step=%lld\n",
-                        __func__, ctrl->id, ctrl->name, ctrl->val,
+                        "id=%d name=%s val=%d min=%lld max=%lld step=%lld\n",
+                        ctrl->id, ctrl->name, ctrl->val,
                         ctrl->minimum, ctrl->maximum, ctrl->step);
 
         switch (ctrl->id) {
@@ -1432,7 +1426,7 @@ struct dvb_frontend *rtl2832_sdr_attach(struct dvb_frontend *fe,
         s->pixelformat = formats[0].pixelformat;
         s->buffersize = formats[0].buffersize;
         s->num_formats = NUM_FORMATS;
-        if (rtl2832_sdr_emulated_fmt == false)
+        if (!rtl2832_sdr_emulated_fmt)
                 s->num_formats -= 1;
 
         mutex_init(&s->v4l2_lock);