include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / drivers / media / video / cx231xx / cx231xx-vbi.c

diff --git a/drivers/media/video/cx231xx/cx231xx-vbi.c b/drivers/media/video/cx231xx/cx231xx-vbi.c
index 0305904..689c5e2 100644 (file)
--- a/drivers/media/video/cx231xx/cx231xx-vbi.c
+++ b/drivers/media/video/cx231xx/cx231xx-vbi.c
@@ -26,9 +26,9 @@
 #include <linux/bitmap.h>
 #include <linux/usb.h>
 #include <linux/i2c.h>
-#include <linux/version.h>
 #include <linux/mm.h>
 #include <linux/mutex.h>
+#include <linux/slab.h>
 
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
@@ -140,23 +140,24 @@ static inline int cx231xx_isoc_vbi_copy(struct cx231xx *dev, struct urb *urb)
                while (bytes_parsed < buffer_size) {
                        u32 bytes_used = 0;
 
-                       sav_eav = cx231xx_find_next_SAV_EAV(p_buffer + bytes_parsed,    /* p_buffer */
-                               buffer_size - bytes_parsed,   /* buffer size */
-                               &bytes_used);   /* Receives bytes used to get SAV/EAV */
+                       sav_eav = cx231xx_find_next_SAV_EAV(
+                               p_buffer + bytes_parsed,        /* p_buffer */
+                               buffer_size - bytes_parsed, /* buffer size */
+                               &bytes_used);   /* bytes used to get SAV/EAV */
 
                        bytes_parsed += bytes_used;
 
                        sav_eav &= 0xF0;
                        if (sav_eav && (bytes_parsed < buffer_size)) {
                                bytes_parsed += cx231xx_get_vbi_line(dev,
-                                               dma_q, sav_eav, /* SAV/EAV */
-                                               p_buffer + bytes_parsed,        /* p_buffer */
-                                               buffer_size - bytes_parsed);    /* buffer size */
+                                       dma_q, sav_eav, /* SAV/EAV */
+                                       p_buffer+bytes_parsed, /* p_buffer */
+                                       buffer_size-bytes_parsed);/*buf size*/
                        }
                }
 
-               /* Save the last four bytes of the buffer so we can check the buffer boundary
-                  condition next time */
+               /* Save the last four bytes of the buffer so we can
+               check the buffer boundary condition next time */
                memcpy(dma_q->partial_buf, p_buffer + buffer_size - 4, 4);
                bytes_parsed = 0;
        }
@@ -186,10 +187,6 @@ vbi_buffer_setup(struct videobuf_queue *vq, unsigned int *count,
        if (*count < CX231XX_MIN_BUF)
                *count = CX231XX_MIN_BUF;
 
-       /* call VBI setup if required */
-       /* cx231xx_i2c_call_clients(&dev->i2c_bus[1], VIDIOC_S_FREQUENCY, &f);
-        */
-
        return 0;
 }