diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-12-19 18:21:36 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-30 05:01:56 -0500 |
commit | 5490a7cbe65d63c6ec45f1013287af1e390c95d7 (patch) | |
tree | bc52247d37c2315a6c3635dabe7f26688c906e9d /drivers/media/video/usbvision/usbvision-i2c.c | |
parent | c627b9d1f580f26fe99a8045d37a57f91e9aef66 (diff) |
[media] usbvision: get rid of camelCase
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/usbvision/usbvision-i2c.c')
-rw-r--r-- | drivers/media/video/usbvision/usbvision-i2c.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c index 81dd53bb5267..7b2cd00bf004 100644 --- a/drivers/media/video/usbvision/usbvision-i2c.c +++ b/drivers/media/video/usbvision/usbvision-i2c.c | |||
@@ -244,7 +244,7 @@ int usbvision_i2c_register(struct usb_usbvision *usbvision) | |||
244 | PDEBUG(DBG_I2C, "i2c bus for %s registered", usbvision->i2c_adap.name); | 244 | PDEBUG(DBG_I2C, "i2c bus for %s registered", usbvision->i2c_adap.name); |
245 | 245 | ||
246 | /* Request the load of the i2c modules we need */ | 246 | /* Request the load of the i2c modules we need */ |
247 | switch (usbvision_device_data[usbvision->DevModel].Codec) { | 247 | switch (usbvision_device_data[usbvision->dev_model].codec) { |
248 | case CODEC_SAA7113: | 248 | case CODEC_SAA7113: |
249 | case CODEC_SAA7111: | 249 | case CODEC_SAA7111: |
250 | /* Without this delay the detection of the saa711x is | 250 | /* Without this delay the detection of the saa711x is |
@@ -255,7 +255,7 @@ int usbvision_i2c_register(struct usb_usbvision *usbvision) | |||
255 | "saa7115_auto", 0, saa711x_addrs); | 255 | "saa7115_auto", 0, saa711x_addrs); |
256 | break; | 256 | break; |
257 | } | 257 | } |
258 | if (usbvision_device_data[usbvision->DevModel].Tuner == 1) { | 258 | if (usbvision_device_data[usbvision->dev_model].tuner == 1) { |
259 | struct v4l2_subdev *sd; | 259 | struct v4l2_subdev *sd; |
260 | enum v4l2_i2c_tuner_type type; | 260 | enum v4l2_i2c_tuner_type type; |
261 | struct tuner_setup tun_setup; | 261 | struct tuner_setup tun_setup; |
@@ -426,18 +426,18 @@ static int usbvision_i2c_write_max4(struct usb_usbvision *usbvision, | |||
426 | static int usbvision_i2c_write(struct usb_usbvision *usbvision, unsigned char addr, char *buf, | 426 | static int usbvision_i2c_write(struct usb_usbvision *usbvision, unsigned char addr, char *buf, |
427 | short len) | 427 | short len) |
428 | { | 428 | { |
429 | char *bufPtr = buf; | 429 | char *buf_ptr = buf; |
430 | int retval; | 430 | int retval; |
431 | int wrcount = 0; | 431 | int wrcount = 0; |
432 | int count; | 432 | int count; |
433 | int maxLen = 4; | 433 | int max_len = 4; |
434 | 434 | ||
435 | while (len > 0) { | 435 | while (len > 0) { |
436 | count = (len > maxLen) ? maxLen : len; | 436 | count = (len > max_len) ? max_len : len; |
437 | retval = usbvision_i2c_write_max4(usbvision, addr, bufPtr, count); | 437 | retval = usbvision_i2c_write_max4(usbvision, addr, buf_ptr, count); |
438 | if (retval > 0) { | 438 | if (retval > 0) { |
439 | len -= count; | 439 | len -= count; |
440 | bufPtr += count; | 440 | buf_ptr += count; |
441 | wrcount += count; | 441 | wrcount += count; |
442 | } else | 442 | } else |
443 | return (retval < 0) ? retval : -EFAULT; | 443 | return (retval < 0) ? retval : -EFAULT; |