diff options
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-i2c-core.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c index c8d0bdee3ff..eca48c90b55 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c +++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | |||
@@ -37,6 +37,10 @@ static unsigned int i2c_scan = 0; | |||
37 | module_param(i2c_scan, int, S_IRUGO|S_IWUSR); | 37 | module_param(i2c_scan, int, S_IRUGO|S_IWUSR); |
38 | MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time"); | 38 | MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time"); |
39 | 39 | ||
40 | static unsigned int pvr2_i2c_client_describe(struct pvr2_i2c_client *cp, | ||
41 | unsigned int detail, | ||
42 | char *buf,unsigned int maxlen); | ||
43 | |||
40 | static int pvr2_i2c_write(struct pvr2_hdw *hdw, /* Context */ | 44 | static int pvr2_i2c_write(struct pvr2_hdw *hdw, /* Context */ |
41 | u8 i2c_addr, /* I2C address we're talking to */ | 45 | u8 i2c_addr, /* I2C address we're talking to */ |
42 | u8 *data, /* Data to write */ | 46 | u8 *data, /* Data to write */ |
@@ -165,12 +169,12 @@ static int pvr2_i2c_read(struct pvr2_hdw *hdw, /* Context */ | |||
165 | 169 | ||
166 | /* This is the common low level entry point for doing I2C operations to the | 170 | /* This is the common low level entry point for doing I2C operations to the |
167 | hardware. */ | 171 | hardware. */ |
168 | int pvr2_i2c_basic_op(struct pvr2_hdw *hdw, | 172 | static int pvr2_i2c_basic_op(struct pvr2_hdw *hdw, |
169 | u8 i2c_addr, | 173 | u8 i2c_addr, |
170 | u8 *wdata, | 174 | u8 *wdata, |
171 | u16 wlen, | 175 | u16 wlen, |
172 | u8 *rdata, | 176 | u8 *rdata, |
173 | u16 rlen) | 177 | u16 rlen) |
174 | { | 178 | { |
175 | if (!rdata) rlen = 0; | 179 | if (!rdata) rlen = 0; |
176 | if (!wdata) wlen = 0; | 180 | if (!wdata) wlen = 0; |
@@ -705,9 +709,9 @@ int pvr2_i2c_core_check_stale(struct pvr2_hdw *hdw) | |||
705 | return (hdw->i2c_pend_types & PVR2_I2C_PEND_ALL) != 0; | 709 | return (hdw->i2c_pend_types & PVR2_I2C_PEND_ALL) != 0; |
706 | } | 710 | } |
707 | 711 | ||
708 | unsigned int pvr2_i2c_client_describe(struct pvr2_i2c_client *cp, | 712 | static unsigned int pvr2_i2c_client_describe(struct pvr2_i2c_client *cp, |
709 | unsigned int detail, | 713 | unsigned int detail, |
710 | char *buf,unsigned int maxlen) | 714 | char *buf,unsigned int maxlen) |
711 | { | 715 | { |
712 | unsigned int ccnt,bcnt; | 716 | unsigned int ccnt,bcnt; |
713 | int spcfl = 0; | 717 | int spcfl = 0; |