lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (7964): cx18 iomem annotations

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Al Viro
2008-05-21 00:32:01 -03:00
committed by Mauro Carvalho Chehab
parent b0510f8dc7
commit 990c81c8af
6 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/video/cx18/cx18-driver.c
View File

@ -670,7 +670,7 @@ static int __devinit cx18_probe(struct pci_dev *dev,
cx18_init_power(cx, 1); cx18_init_power(cx, 1);
cx18_init_memory(cx); cx18_init_memory(cx);
cx->scb = (struct cx18_scb *)(cx->enc_mem + SCB_OFFSET); cx->scb = (struct cx18_scb __iomem *)(cx->enc_mem + SCB_OFFSET);
cx18_init_scb(cx); cx18_init_scb(cx);
cx18_gpio_init(cx); cx18_gpio_init(cx);

2
drivers/media/video/cx18/cx18-driver.h
View File

@ -358,7 +358,7 @@ struct cx18 {
u32 v4l2_cap; /* V4L2 capabilities of card */ u32 v4l2_cap; /* V4L2 capabilities of card */
u32 hw_flags; /* Hardware description of the board */ u32 hw_flags; /* Hardware description of the board */
unsigned mdl_offset; unsigned mdl_offset;
struct cx18_scb *scb; /* pointer to SCB */ struct cx18_scb __iomem *scb; /* pointer to SCB */
struct cx18_av_state av_state; struct cx18_av_state av_state;

3
drivers/media/video/cx18/cx18-fileops.c
View File

@ -361,7 +361,8 @@ static ssize_t cx18_read(struct cx18_stream *s, char __user *ubuf,
cx18_enqueue(s, buf, &s->q_free); cx18_enqueue(s, buf, &s->q_free);
cx18_vapi(cx, CX18_CPU_DE_SET_MDL, 5, cx18_vapi(cx, CX18_CPU_DE_SET_MDL, 5,
s->handle, s->handle,
(void *)&cx->scb->cpu_mdl[buf->id] - cx->enc_mem, (void __iomem *)&cx->scb->cpu_mdl[buf->id] -
cx->enc_mem,
1, buf->id, s->buf_size); 1, buf->id, s->buf_size);
} else } else
cx18_enqueue(s, buf, &s->q_io); cx18_enqueue(s, buf, &s->q_io);

2
drivers/media/video/cx18/cx18-irq.c
View File

@ -75,7 +75,7 @@ static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb)
cx18_buf_sync_for_device(s, buf); cx18_buf_sync_for_device(s, buf);
cx18_vapi(cx, CX18_CPU_DE_SET_MDL, 5, s->handle, cx18_vapi(cx, CX18_CPU_DE_SET_MDL, 5, s->handle,
(void *)&cx->scb->cpu_mdl[buf->id] - cx->enc_mem, (void __iomem *)&cx->scb->cpu_mdl[buf->id] - cx->enc_mem,
1, buf->id, s->buf_size); 1, buf->id, s->buf_size);
} else } else
set_bit(CX18_F_B_NEED_BUF_SWAP, &buf->b_flags); set_bit(CX18_F_B_NEED_BUF_SWAP, &buf->b_flags);

8
drivers/media/video/cx18/cx18-mailbox.c
View File

@ -94,10 +94,10 @@ static const struct cx18_api_info *find_api_info(u32 cmd)
return NULL; return NULL;
} }
static struct cx18_mailbox *cx18_mb_is_complete(struct cx18 *cx, int rpu, static struct cx18_mailbox __iomem *cx18_mb_is_complete(struct cx18 *cx, int rpu,
u32 *state, u32 *irq, u32 *req) u32 *state, u32 *irq, u32 *req)
{ {
struct cx18_mailbox *mb = NULL; struct cx18_mailbox __iomem *mb = NULL;
int wait_count = 0; int wait_count = 0;
u32 ack; u32 ack;
@ -142,7 +142,7 @@ static struct cx18_mailbox *cx18_mb_is_complete(struct cx18 *cx, int rpu,
long cx18_mb_ack(struct cx18 *cx, const struct cx18_mailbox *mb) long cx18_mb_ack(struct cx18 *cx, const struct cx18_mailbox *mb)
{ {
const struct cx18_api_info *info = find_api_info(mb->cmd); const struct cx18_api_info *info = find_api_info(mb->cmd);
struct cx18_mailbox *ack_mb; struct cx18_mailbox __iomem *ack_mb;
u32 ack_irq; u32 ack_irq;
u8 rpu = CPU; u8 rpu = CPU;
@ -182,7 +182,7 @@ static int cx18_api_call(struct cx18 *cx, u32 cmd, int args, u32 data[])
{ {
const struct cx18_api_info *info = find_api_info(cmd); const struct cx18_api_info *info = find_api_info(cmd);
u32 state = 0, irq = 0, req, oldreq, err; u32 state = 0, irq = 0, req, oldreq, err;
struct cx18_mailbox *mb; struct cx18_mailbox __iomem *mb;
wait_queue_head_t *waitq; wait_queue_head_t *waitq;
int timeout = 100; int timeout = 100;
int cnt = 0; int cnt = 0;

8
drivers/media/video/cx18/cx18-streams.c
View File

@ -473,8 +473,8 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)
} }
cx18_vapi(cx, CX18_CPU_DE_SET_MDL_ACK, 3, s->handle, cx18_vapi(cx, CX18_CPU_DE_SET_MDL_ACK, 3, s->handle,
(void *)&cx->scb->cpu_mdl_ack[s->type][0] - cx->enc_mem, (void __iomem *)&cx->scb->cpu_mdl_ack[s->type][0] - cx->enc_mem,
(void *)&cx->scb->cpu_mdl_ack[s->type][1] - cx->enc_mem); (void __iomem *)&cx->scb->cpu_mdl_ack[s->type][1] - cx->enc_mem);
list_for_each(p, &s->q_free.list) { list_for_each(p, &s->q_free.list) {
struct cx18_buffer *buf = list_entry(p, struct cx18_buffer, list); struct cx18_buffer *buf = list_entry(p, struct cx18_buffer, list);
@ -482,8 +482,8 @@ int cx18_start_v4l2_encode_stream(struct cx18_stream *s)
writel(buf->dma_handle, &cx->scb->cpu_mdl[buf->id].paddr); writel(buf->dma_handle, &cx->scb->cpu_mdl[buf->id].paddr);
writel(s->buf_size, &cx->scb->cpu_mdl[buf->id].length); writel(s->buf_size, &cx->scb->cpu_mdl[buf->id].length);
cx18_vapi(cx, CX18_CPU_DE_SET_MDL, 5, s->handle, cx18_vapi(cx, CX18_CPU_DE_SET_MDL, 5, s->handle,
(void *)&cx->scb->cpu_mdl[buf->id] - cx->enc_mem, 1, (void __iomem *)&cx->scb->cpu_mdl[buf->id] - cx->enc_mem,
buf->id, s->buf_size); 1, buf->id, s->buf_size);
} }
/* begin_capture */ /* begin_capture */
if (cx18_vapi(cx, CX18_CPU_CAPTURE_START, 1, s->handle)) { if (cx18_vapi(cx, CX18_CPU_CAPTURE_START, 1, s->handle)) {