mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-28 07:13:34 +00:00
Code Issues Releases Wiki Activity

V4L/DVB (5504): Sn9c102: Make driver V4L2 not V4L1

Browse source 
sn9c102 is a v4l2 driver, except it used a couple v4l1 helper functions.
Stop using those functions and depend on V4L2 in Kconfig.
Acked-by: Luca Risolia <luca.risolia@studio.unibo.it>

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Trent Piepho 2007-04-04 17:11:06 -03:00 committed by Mauro Carvalho Chehab
parent 7e81d8254d
commit 990e3743b5
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/media/video/sn9c102/Kconfig
View file

@ -1,6 +1,6 @@
config USB_SN9C102 config USB_SN9C102
tristate "USB SN9C1xx PC Camera Controller support" tristate "USB SN9C1xx PC Camera Controller support"
depends on USB && VIDEO_V4L1 depends on USB && VIDEO_V4L2
---help--- ---help---
Say Y here if you want support for cameras based on SONiX SN9C101, Say Y here if you want support for cameras based on SONiX SN9C101,
SN9C102, SN9C103, SN9C105 and SN9C120 PC Camera Controllers. SN9C102, SN9C103, SN9C105 and SN9C120 PC Camera Controllers.

30
drivers/media/video/sn9c102/sn9c102_core.c
View file

@ -1420,35 +1420,35 @@ static CLASS_DEVICE_ATTR(frame_header, S_IRUGO,
static int sn9c102_create_sysfs(struct sn9c102_device* cam) static int sn9c102_create_sysfs(struct sn9c102_device* cam)
{ {
struct video_device *v4ldev = cam->v4ldev; struct class_device *classdev = &(cam->v4ldev->class_dev);
int err = 0; int err = 0;
if ((err = video_device_create_file(v4ldev, &class_device_attr_reg))) if ((err = class_device_create_file(classdev, &class_device_attr_reg)))
goto err_out; goto err_out;
if ((err = video_device_create_file(v4ldev, &class_device_attr_val))) if ((err = class_device_create_file(classdev, &class_device_attr_val)))
goto err_reg; goto err_reg;
if ((err = video_device_create_file(v4ldev, if ((err = class_device_create_file(classdev,
&class_device_attr_frame_header))) &class_device_attr_frame_header)))
goto err_val; goto err_val;
if (cam->sensor.sysfs_ops) { if (cam->sensor.sysfs_ops) {
if ((err = video_device_create_file(v4ldev, if ((err = class_device_create_file(classdev,
&class_device_attr_i2c_reg))) &class_device_attr_i2c_reg)))
goto err_frame_header; goto err_frame_header;
if ((err = video_device_create_file(v4ldev, if ((err = class_device_create_file(classdev,
&class_device_attr_i2c_val))) &class_device_attr_i2c_val)))
goto err_i2c_reg; goto err_i2c_reg;
} }
if (cam->bridge == BRIDGE_SN9C101 || cam->bridge == BRIDGE_SN9C102) { if (cam->bridge == BRIDGE_SN9C101 || cam->bridge == BRIDGE_SN9C102) {
if ((err = video_device_create_file(v4ldev, if ((err = class_device_create_file(classdev,
&class_device_attr_green))) &class_device_attr_green)))
goto err_i2c_val; goto err_i2c_val;
} else { } else {
if ((err = video_device_create_file(v4ldev, if ((err = class_device_create_file(classdev,
&class_device_attr_blue))) &class_device_attr_blue)))
goto err_i2c_val; goto err_i2c_val;
if ((err = video_device_create_file(v4ldev, if ((err = class_device_create_file(classdev,
&class_device_attr_red))) &class_device_attr_red)))
goto err_blue; goto err_blue;
} }
@ -1456,19 +1456,19 @@ static int sn9c102_create_sysfs(struct sn9c102_device* cam)
return 0; return 0;
err_blue: err_blue:
video_device_remove_file(v4ldev, &class_device_attr_blue); class_device_remove_file(classdev, &class_device_attr_blue);
err_i2c_val: err_i2c_val:
if (cam->sensor.sysfs_ops) if (cam->sensor.sysfs_ops)
video_device_remove_file(v4ldev, &class_device_attr_i2c_val); class_device_remove_file(classdev, &class_device_attr_i2c_val);
err_i2c_reg: err_i2c_reg:
if (cam->sensor.sysfs_ops) if (cam->sensor.sysfs_ops)
video_device_remove_file(v4ldev, &class_device_attr_i2c_reg); class_device_remove_file(classdev, &class_device_attr_i2c_reg);
err_frame_header: err_frame_header:
video_device_remove_file(v4ldev, &class_device_attr_frame_header); class_device_remove_file(classdev, &class_device_attr_frame_header);
err_val: err_val:
video_device_remove_file(v4ldev, &class_device_attr_val); class_device_remove_file(classdev, &class_device_attr_val);
err_reg: err_reg:
video_device_remove_file(v4ldev, &class_device_attr_reg); class_device_remove_file(classdev, &class_device_attr_reg);
err_out: err_out:
return err; return err;
} }