V4L/DVB (6776): ivtv: Some general fixes

Fix "warning: Using plain integer as NULL pointer".
Convert 'x < y ? x : y' to use min() instead.

Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 4994dc59d40ca9544e000821bab69ef6146c3e4e..2765624b230fb9e875bd071ac7b9ccc38416a2e7 100644 (file)
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -983,7 +983,7 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
        }
 
        itv = kzalloc(sizeof(struct ivtv), GFP_ATOMIC);
-       if (itv == 0) {
+       if (itv == NULL) {
                spin_unlock(&ivtv_cards_lock);
                return -ENOMEM;
        }

diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 25b68843a28940960f57e1034f0cea4ac46c30eb..edef2a579617e722c5357b93775f88620faff327 100644 (file)
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -698,7 +698,7 @@ static int ivtv_debug_ioctls(struct file *filp, unsigned int cmd, void *arg)
                        ivtv_reset_ir_gpio(itv);
                }
                if (val & 0x02) {
-                       itv->video_dec_func(itv, cmd, 0);
+                       itv->video_dec_func(itv, cmd, NULL);
                }
                break;
        }

diff --git a/drivers/media/video/ivtv/ivtv-irq.c b/drivers/media/video/ivtv/ivtv-irq.c
index c5ea54e652722dc6b2f0deda8ef144698775bc4b..65604dde972614cfb9c1926c3dcd89649cacc2cf 100644 (file)
--- a/drivers/media/video/ivtv/ivtv-irq.c
+++ b/drivers/media/video/ivtv/ivtv-irq.c
@@ -204,7 +204,7 @@ static int stream_enc_dma_append(struct ivtv_stream *s, u32 data[CX2341X_MBOX_MA
                s->sg_pending[idx].dst = buf->dma_handle;
                s->sg_pending[idx].src = offset;
                s->sg_pending[idx].size = s->buf_size;
-               buf->bytesused = (size < s->buf_size) ? size : s->buf_size;
+               buf->bytesused = min(size, s->buf_size);
                buf->dma_xfer_cnt = s->dma_xfer_cnt;
 
                s->q_predma.bytesused += buf->bytesused;
@@ -736,7 +736,7 @@ static void ivtv_irq_dec_data_req(struct ivtv *itv)
                s = &itv->streams[IVTV_DEC_STREAM_TYPE_YUV];
        }
        else {
-               itv->dma_data_req_size = data[2] >= 0x10000 ? 0x10000 : data[2];
+               itv->dma_data_req_size = min_t(u32, data[2], 0x10000);
                itv->dma_data_req_offset = data[1];
                s = &itv->streams[IVTV_DEC_STREAM_TYPE_MPG];
        }

diff --git a/drivers/media/video/ivtv/ivtv-streams.c b/drivers/media/video/ivtv/ivtv-streams.c
index 3ca2a1a62a71d4901e62c41e0d8df538a2fcdc5c..24d98ecf35ad13de77f4d2457de6c8ba09c9c584 100644 (file)
--- a/drivers/media/video/ivtv/ivtv-streams.c
+++ b/drivers/media/video/ivtv/ivtv-streams.c
@@ -572,10 +572,10 @@ int ivtv_start_v4l2_encode_stream(struct ivtv_stream *s)
                clear_bit(IVTV_F_I_EOS, &itv->i_flags);
 
                /* Initialize Digitizer for Capture */
-               itv->video_dec_func(itv, VIDIOC_STREAMOFF, 0);
+               itv->video_dec_func(itv, VIDIOC_STREAMOFF, NULL);
                ivtv_msleep_timeout(300, 1);
                ivtv_vapi(itv, CX2341X_ENC_INITIALIZE_INPUT, 0);
-               itv->video_dec_func(itv, VIDIOC_STREAMON, 0);
+               itv->video_dec_func(itv, VIDIOC_STREAMON, NULL);
        }
 
        /* begin_capture */

diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c
index 1a73038ea811b13b131a65b9c8b7fc18105ca91b..3b23fc05f7c4331dc1d15b61af39a3cb1d3133da 100644 (file)
--- a/drivers/media/video/ivtv/ivtvfb.c
+++ b/drivers/media/video/ivtv/ivtvfb.c
@@ -1057,7 +1057,7 @@ static int ivtvfb_init_card(struct ivtv *itv)
        }
 
        itv->osd_info = kzalloc(sizeof(struct osd_info), GFP_ATOMIC);
-       if (itv->osd_info == 0) {
+       if (itv->osd_info == NULL) {
                IVTVFB_ERR("Failed to allocate memory for osd_info\n");
                return -ENOMEM;
        }