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

V4L/DVB (8746): v4l-dvb: fix compile warnings.

Browse Source 
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil
2008-08-22 17:12:08 -03:00
committed by Mauro Carvalho Chehab
parent 614b147b4f
commit eda9e4e294
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/dvb/frontends/nxt200x.c
View File

@@ -80,7 +80,7 @@ static int i2c_writebytes (struct nxt200x_state* state, u8 addr, u8 *buf, u8 len
return 0; return 0;
} }
static u8 i2c_readbytes (struct nxt200x_state* state, u8 addr, u8* buf, u8 len) static int i2c_readbytes(struct nxt200x_state *state, u8 addr, u8 *buf, u8 len)
{ {
int err; int err;
struct i2c_msg msg = { .addr = addr, .flags = I2C_M_RD, .buf = buf, .len = len }; struct i2c_msg msg = { .addr = addr, .flags = I2C_M_RD, .buf = buf, .len = len };
@@ -111,7 +111,7 @@ static int nxt200x_writebytes (struct nxt200x_state* state, u8 reg,
return 0; return 0;
} }
static u8 nxt200x_readbytes (struct nxt200x_state* state, u8 reg, u8* buf, u8 len) static int nxt200x_readbytes(struct nxt200x_state *state, u8 reg, u8 *buf, u8 len)
{ {
u8 reg2 [] = { reg }; u8 reg2 [] = { reg };

2
drivers/media/dvb/frontends/or51211.c
View File

@@ -88,7 +88,7 @@ static int i2c_writebytes (struct or51211_state* state, u8 reg, const u8 *buf,
return 0; return 0;
} }
static u8 i2c_readbytes (struct or51211_state* state, u8 reg, u8* buf, int len) static int i2c_readbytes(struct or51211_state *state, u8 reg, u8 *buf, int len)
{ {
int err; int err;
struct i2c_msg msg; struct i2c_msg msg;

6
drivers/media/video/vino.c
View File

@@ -809,7 +809,7 @@ static void vino_free_buffer_with_count(struct vino_framebuffer *fb,
dprintk("vino_free_buffer_with_count(): count = %d\n", count); dprintk("vino_free_buffer_with_count(): count = %d\n", count);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
ClearPageReserved(virt_to_page(fb->desc_table.virtual[i])); ClearPageReserved(virt_to_page((void *)fb->desc_table.virtual[i]));
dma_unmap_single(NULL, dma_unmap_single(NULL,
fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i], fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i],
PAGE_SIZE, DMA_FROM_DEVICE); PAGE_SIZE, DMA_FROM_DEVICE);
@@ -887,7 +887,7 @@ static int vino_allocate_buffer(struct vino_framebuffer *fb,
dma_data_addr + VINO_PAGE_SIZE * j; dma_data_addr + VINO_PAGE_SIZE * j;
} }
SetPageReserved(virt_to_page(fb->desc_table.virtual[i])); SetPageReserved(virt_to_page((void *)fb->desc_table.virtual[i]));
} }
/* page_count needs to be set anyway, because the descriptor table has /* page_count needs to be set anyway, because the descriptor table has
@@ -974,7 +974,7 @@ static int vino_prepare_user_buffer(struct vino_framebuffer *fb,
dma_data_addr + VINO_PAGE_SIZE * j; dma_data_addr + VINO_PAGE_SIZE * j;
} }
SetPageReserved(virt_to_page(fb->desc_table.virtual[i])); SetPageReserved(virt_to_page((void *)fb->desc_table.virtual[i]));
} }
/* page_count needs to be set anyway, because the descriptor table has /* page_count needs to be set anyway, because the descriptor table has