Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / media / video / saa7164 / saa7164-core.c

diff --git a/drivers/media/video/saa7164/saa7164-core.c b/drivers/media/video/saa7164/saa7164-core.c
index 8f3c47e..14e158e 100644 (file)
--- a/drivers/media/video/saa7164/saa7164-core.c
+++ b/drivers/media/video/saa7164/saa7164-core.c
@@ -140,7 +140,7 @@ static void saa7164_ts_verifier(struct saa7164_buffer *buf)
        u32 i;
        u8 cc, a;
        u16 pid;
        u32 i;
        u8 cc, a;
        u16 pid;

-       u8 __iomem *bufcpu = (u8 *)buf->cpu;
+       u8 *bufcpu = (u8 *)buf->cpu;

 
        port->sync_errors = 0;
        port->v_cc_errors = 0;
 
        port->sync_errors = 0;
        port->v_cc_errors = 0;


@@ -281,7 +281,7 @@ static void saa7164_work_enchandler_helper(struct saa7164_port *port, int bufnr)
        struct saa7164_user_buffer *ubuf = NULL;
        struct list_head *c, *n;
        int i = 0;
        struct saa7164_user_buffer *ubuf = NULL;
        struct list_head *c, *n;
        int i = 0;

-       u8 __iomem *p;
+       u8 *p;

 
        mutex_lock(&port->dmaqueue_lock);
        list_for_each_safe(c, n, &port->dmaqueue.list) {
 
        mutex_lock(&port->dmaqueue_lock);
        list_for_each_safe(c, n, &port->dmaqueue.list) {


@@ -338,8 +338,7 @@ static void saa7164_work_enchandler_helper(struct saa7164_port *port, int bufnr)
 
                                if (buf->actual_size <= ubuf->actual_size) {
 
 
                                if (buf->actual_size <= ubuf->actual_size) {
 

-                                       memcpy_fromio(ubuf->data, buf->cpu,
-                                               ubuf->actual_size);
+                                       memcpy(ubuf->data, buf->cpu, ubuf->actual_size);

 
                                        if (crc_checking) {
                                                /* Throw a new checksum on the read buffer */
 
                                        if (crc_checking) {
                                                /* Throw a new checksum on the read buffer */


@@ -366,7 +365,7 @@ static void saa7164_work_enchandler_helper(struct saa7164_port *port, int bufnr)
                         * with known bad data. We check for this data at a later point
                         * in time. */
                        saa7164_buffer_zero_offsets(port, bufnr);
                         * with known bad data. We check for this data at a later point
                         * in time. */
                        saa7164_buffer_zero_offsets(port, bufnr);

-                       memset_io(buf->cpu, 0xff, buf->pci_size);
+                       memset(buf->cpu, 0xff, buf->pci_size);

                        if (crc_checking) {
                                /* Throw yet aanother new checksum on the dma buffer */
                                buf->crc = crc32(0, buf->cpu, buf->actual_size);
                        if (crc_checking) {
                                /* Throw yet aanother new checksum on the dma buffer */
                                buf->crc = crc32(0, buf->cpu, buf->actual_size);


@@ -1134,7 +1133,7 @@ static int saa7164_proc_show(struct seq_file *m, void *v)
                        if (c == 0)
                                seq_printf(m, " %04x:", i);
 
                        if (c == 0)
                                seq_printf(m, " %04x:", i);
 

-                       seq_printf(m, " %02x", *(b->m_pdwSetRing + i));
+                       seq_printf(m, " %02x", readb(b->m_pdwSetRing + i));

 
                        if (++c == 16) {
                                seq_printf(m, "\n");
 
                        if (++c == 16) {
                                seq_printf(m, "\n");


@@ -1149,7 +1148,7 @@ static int saa7164_proc_show(struct seq_file *m, void *v)
                        if (c == 0)
                                seq_printf(m, " %04x:", i);
 
                        if (c == 0)
                                seq_printf(m, " %04x:", i);
 

-                       seq_printf(m, " %02x", *(b->m_pdwGetRing + i));
+                       seq_printf(m, " %02x", readb(b->m_pdwGetRing + i));

 
                        if (++c == 16) {
                                seq_printf(m, "\n");
 
                        if (++c == 16) {
                                seq_printf(m, "\n");