diff options
| author | Thierry MERLE <thierry.merle@free.fr> | 2007-04-14 21:23:49 +0200 |
|---|---|---|
| committer | Thierry MERLE <thierry.merle@free.fr> | 2007-04-14 21:23:49 +0200 |
| commit | 22e817a32eb6749a62cb77aa429be23a76875650 (patch) | |
| tree | 369a9cf258537251f4354843e16f51af2c8da50d /linux/drivers/media/video/usbvision/usbvision-video.c | |
| parent | ea4dd59f09799234a2b807e318e83059b24863a1 (diff) | |
| download | mediapointer-dvb-s2-22e817a32eb6749a62cb77aa429be23a76875650.tar.gz mediapointer-dvb-s2-22e817a32eb6749a62cb77aa429be23a76875650.tar.bz2 | |
usbvision: i2c function cleanups
From: Thierry MERLE <thierry.merle@free.fr>
usbvision-i2c function renamings, code cleanup
Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
Diffstat (limited to 'linux/drivers/media/video/usbvision/usbvision-video.c')
| -rw-r--r-- | linux/drivers/media/video/usbvision/usbvision-video.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/linux/drivers/media/video/usbvision/usbvision-video.c b/linux/drivers/media/video/usbvision/usbvision-video.c index 6cce05962..a926dde79 100644 --- a/linux/drivers/media/video/usbvision/usbvision-video.c +++ b/linux/drivers/media/video/usbvision/usbvision-video.c @@ -430,7 +430,7 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file) down(&usbvision->lock); if (usbvision->power == 0) { usbvision_power_on(usbvision); - usbvision_init_i2c(usbvision); + usbvision_i2c_register(usbvision); } /* Send init sequence only once, it's large! */ @@ -452,7 +452,7 @@ static int usbvision_v4l2_open(struct inode *inode, struct file *file) } else { if (PowerOnAtOpen) { - usbvision_i2c_usb_del_bus(&usbvision->i2c_adap); + usbvision_i2c_unregister(usbvision); usbvision_power_off(usbvision); usbvision->initialized = 0; } @@ -1303,7 +1303,7 @@ static int usbvision_radio_open(struct inode *inode, struct file *file) usbvision_reset_powerOffTimer(usbvision); if (usbvision->power == 0) { usbvision_power_on(usbvision); - usbvision_init_i2c(usbvision); + usbvision_i2c_register(usbvision); } } @@ -1328,7 +1328,7 @@ static int usbvision_radio_open(struct inode *inode, struct file *file) MOD_DEC_USE_COUNT; #endif if (PowerOnAtOpen) { - usbvision_i2c_usb_del_bus(&usbvision->i2c_adap); + usbvision_i2c_unregister(usbvision); usbvision_power_off(usbvision); usbvision->initialized = 0; } @@ -1934,7 +1934,7 @@ static void usbvision_configure_video(struct usb_usbvision *usbvision) usbvision_audio_off(usbvision); //first switch off audio if (!PowerOnAtOpen) { usbvision_power_on(usbvision); //and then power up the noisy tuner - usbvision_init_i2c(usbvision); + usbvision_i2c_register(usbvision); } } @@ -2097,7 +2097,7 @@ static void __devexit usbvision_disconnect(struct usb_interface *intf) usbvision_stop_isoc(usbvision); if (usbvision->power) { - usbvision_i2c_usb_del_bus(&usbvision->i2c_adap); + usbvision_i2c_unregister(usbvision); usbvision_power_off(usbvision); } usbvision->remove_pending = 1; // Now all ISO data will be ignored |