V4L/DVB (7964): cx18 iomem annotations (990c81c8) · Commits · 戴 / test

drivers/media/video/cx18/cx18-driver.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -670,7 +670,7 @@ static int __devinit cx18_probe(struct pci_dev *dev,
		cx18_init_power(cx, 1);
		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_gpio_init(cx);

+1 −1

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

		struct cx18_av_state av_state;

+2 −1

Original line number	Diff line number	Diff line
		@@ -361,7 +361,8 @@ static ssize_t cx18_read(struct cx18_stream s, char __user ubuf,
		cx18_enqueue(s, buf, &s->q_free);
		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);
		} else
		cx18_enqueue(s, buf, &s->q_io);

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ static void epu_dma_done(struct cx18 cx, struct cx18_mailbox mb)

		cx18_buf_sync_for_device(s, buf);
		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);
		} else
		set_bit(CX18_F_B_NEED_BUF_SWAP, &buf->b_flags);

+4 −4

Original line number	Diff line number	Diff line
		@@ -94,10 +94,10 @@ static const struct cx18_api_info *find_api_info(u32 cmd)
		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)
		{
		struct cx18_mailbox *mb = NULL;
		struct cx18_mailbox __iomem *mb = NULL;
		int wait_count = 0;
		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)
		{
		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;
		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);
		u32 state = 0, irq = 0, req, oldreq, err;
		struct cx18_mailbox *mb;
		struct cx18_mailbox __iomem *mb;
		wait_queue_head_t *waitq;
		int timeout = 100;
		int cnt = 0;