This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / media / video / saa5246a.c

diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index c2fb64d..eecc102 100644 (file)
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -1,10 +1,9 @@
 /*
- * Driver for the SAA5246A or SAA5281 Teletext (=Videotext) decoder chips from
- * Philips.
+ * Driver for the SAA5246A videotext decoder chip from Philips.
  *
- * Only capturing of Teletext pages is tested. The videotext chips also have a
- * TV output but my hardware doesn't use it. For this reason this driver does
- * not support changing any TV display settings.
+ * Only capturing of videotext pages is tested. The SAA5246A chip also has
+ * a TV output but my hardware doesn't use it. For this reason this driver
+ * does not support changing any TV display settings.
  *
  * Copyright (C) 2004 Michael Geng <linux@MichaelGeng.de>
  *
@@ -48,10 +47,6 @@
 #include <linux/videodev.h>
 #include "saa5246a.h"
 
-MODULE_AUTHOR("Michael Geng <linux@MichaelGeng.de>");
-MODULE_DESCRIPTION("Philips SAA5246A, SAA5281 Teletext decoder driver");
-MODULE_LICENSE("GPL");
-
 struct saa5246a_device
 {
        u8     pgbuf[NUM_DAUS][VTX_VIRTUALSIZE];
@@ -485,76 +480,73 @@ static inline int saa5246a_get_status(struct saa5246a_device *t,
 static inline int saa5246a_get_page(struct saa5246a_device *t,
        vtx_pagereq_t *req)
 {
-       int start, end, size;
-       char *buf;
-       int err;
+       int start, end;
 
        if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS ||
            req->start < 0 || req->start > req->end || req->end >= VTX_PAGESIZE)
                return -EINVAL;
-
-       buf = kmalloc(VTX_PAGESIZE, GFP_KERNEL);
-       if (!buf)
-               return -ENOMEM;
-
        /* Read "normal" part of page */
-       err = -EIO;
-
        end = min(req->end, VTX_PAGESIZE - 1);
        if (i2c_senddata(t, SAA5246A_REGISTER_R8,
-                       req->pgbuf | R8_DO_NOT_CLEAR_MEMORY,
-                       ROW(req->start), COLUMN(req->start), COMMAND_END))
-               goto out;
-       if (i2c_getdata(t, end - req->start + 1, buf))
-               goto out;
-       err = -EFAULT;
-       if (copy_to_user(req->buffer, buf, end - req->start + 1))
-               goto out;
 
+               req->pgbuf |
+               R8_DO_NOT_CLEAR_MEMORY,
+
+               ROW(req->start),
+
+               COLUMN(req->start),
+
+               COMMAND_END) ||
+               i2c_getdata(t, end - req->start + 1, req->buffer))
+       {
+               return -EIO;
+       }
        /* Always get the time from buffer 4, since this stupid SAA5246A only
         * updates the currently displayed buffer...
         */
-       if (REQ_CONTAINS_TIME(req)) {
+       if (REQ_CONTAINS_TIME(req))
+       {
                start = max(req->start, POS_TIME_START);
                end   = min(req->end,   POS_TIME_END);
-               size = end - start + 1;
-               err = -EINVAL;
-               if (size < 0)
-                       goto out;
-               err = -EIO;
                if (i2c_senddata(t, SAA5246A_REGISTER_R8,
-                               R8_ACTIVE_CHAPTER_4 | R8_DO_NOT_CLEAR_MEMORY,
-                               R9_CURSER_ROW_0, start, COMMAND_END))
-                       goto out;
-               if (i2c_getdata(t, size, buf))
-                       goto out;
-               err = -EFAULT;
-               if (copy_to_user(req->buffer + start - req->start, buf, size))
-                       goto out;
+
+                       R8_ACTIVE_CHAPTER_4 |
+                       R8_DO_NOT_CLEAR_MEMORY,
+
+                       R9_CURSER_ROW_0,
+
+                       start,
+
+                       COMMAND_END) ||
+                       i2c_getdata(t, end - start + 1,
+                               req->buffer + start - req->start))
+               {
+                       return -EIO;
+               }
        }
        /* Insert the header from buffer 4 only, if acquisition circuit is still searching for a page */
-       if (REQ_CONTAINS_HEADER(req) && t->is_searching[req->pgbuf]) {
+       if (REQ_CONTAINS_HEADER(req) && t->is_searching[req->pgbuf])
+       {
                start = max(req->start, POS_HEADER_START);
                end   = min(req->end,   POS_HEADER_END);
-               size = end - start + 1;
-               err = -EINVAL;
-               if (size < 0)
-                       goto out;
-               err = -EIO;
                if (i2c_senddata(t, SAA5246A_REGISTER_R8,
-                               R8_ACTIVE_CHAPTER_4 | R8_DO_NOT_CLEAR_MEMORY,
-                               R9_CURSER_ROW_0, start, COMMAND_END))
-                       goto out;
-               if (i2c_getdata(t, end - start + 1, buf))
-                       goto out;
-               err = -EFAULT;
-               if (copy_to_user(req->buffer + start - req->start, buf, size))
-                       goto out;
+
+                       R8_ACTIVE_CHAPTER_4 |
+                       R8_DO_NOT_CLEAR_MEMORY,
+
+                       R9_CURSER_ROW_0,
+
+                       start,
+
+                       COMMAND_END) ||
+                       i2c_getdata(t, end - start + 1,
+                               req->buffer + start - req->start))
+               {
+                       return -EIO;
+               }
        }
-       err = 0;
-out:
-       kfree(buf);
-       return err;
+
+       return 0;
 }
 
 /* Stops the acquisition circuit given in dau_no. The page buffer associated
@@ -772,8 +764,8 @@ static int saa5246a_release(struct inode *inode, struct file *file)
 
 static int __init init_saa_5246a (void)
 {
-       printk(KERN_INFO
-               "SAA5246A (or compatible) Teletext decoder driver version %d.%d\n",
+       printk(KERN_INFO "SAA5246A driver (" IF_NAME
+               " interface) for VideoText version %d.%d\n",
                MAJOR_VERSION, MINOR_VERSION);
        return i2c_add_driver(&i2c_driver_videotext);
 }
@@ -804,3 +796,5 @@ static struct video_device saa_template =
        .release  = video_device_release,
        .minor    = -1,
 };
+
+MODULE_LICENSE("GPL");