diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-10-19 17:54:26 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-21 12:31:37 -0400 |
commit | c6330fb86fd0fed98b7e0d5792881a77b778fefc (patch) | |
tree | 3c87d6fa7053963cfdea592a2956b28354ce0832 /drivers/media/video/sn9c102 | |
parent | 323a491a29d0bb1e91263ca347cb42c4de28adfc (diff) |
V4L/DVB (9327): v4l: use video_device.num instead of minor in video%d
The kernel number of a v4l2 node (e.g. videoX, radioX or vbiX) is now
independent of the minor number. So instead of using the minor field
of the video_device struct one has to use the num field: this always
contains the kernel number of the device node.
I forgot about this when I did the v4l2 core change, so this patch
converts all drivers that use it in one go. Luckily the change is
trivial.
Cc: michael@mihu.de
Cc: mchehab@infradead.org
Cc: corbet@lwn.net
Cc: luca.risolia@studio.unibo.it
Cc: isely@pobox.com
Cc: pe1rxq@amsat.org
Cc: royale@zerezo.com
Cc: mkrufky@linuxtv.org
Cc: stoth@linuxtv.org
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/sn9c102')
-rw-r--r-- | drivers/media/video/sn9c102/sn9c102_core.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c index 20e30bd9364..fcd2b62f92c 100644 --- a/drivers/media/video/sn9c102/sn9c102_core.c +++ b/drivers/media/video/sn9c102/sn9c102_core.c | |||
@@ -1008,7 +1008,7 @@ static int sn9c102_stream_interrupt(struct sn9c102_device* cam) | |||
1008 | cam->state |= DEV_MISCONFIGURED; | 1008 | cam->state |= DEV_MISCONFIGURED; |
1009 | DBG(1, "URB timeout reached. The camera is misconfigured. " | 1009 | DBG(1, "URB timeout reached. The camera is misconfigured. " |
1010 | "To use it, close and open /dev/video%d again.", | 1010 | "To use it, close and open /dev/video%d again.", |
1011 | cam->v4ldev->minor); | 1011 | cam->v4ldev->num); |
1012 | return -EIO; | 1012 | return -EIO; |
1013 | } | 1013 | } |
1014 | 1014 | ||
@@ -1734,7 +1734,7 @@ static void sn9c102_release_resources(struct kref *kref) | |||
1734 | 1734 | ||
1735 | cam = container_of(kref, struct sn9c102_device, kref); | 1735 | cam = container_of(kref, struct sn9c102_device, kref); |
1736 | 1736 | ||
1737 | DBG(2, "V4L2 device /dev/video%d deregistered", cam->v4ldev->minor); | 1737 | DBG(2, "V4L2 device /dev/video%d deregistered", cam->v4ldev->num); |
1738 | video_set_drvdata(cam->v4ldev, NULL); | 1738 | video_set_drvdata(cam->v4ldev, NULL); |
1739 | video_unregister_device(cam->v4ldev); | 1739 | video_unregister_device(cam->v4ldev); |
1740 | usb_put_dev(cam->usbdev); | 1740 | usb_put_dev(cam->usbdev); |
@@ -1792,7 +1792,7 @@ static int sn9c102_open(struct inode* inode, struct file* filp) | |||
1792 | 1792 | ||
1793 | if (cam->users) { | 1793 | if (cam->users) { |
1794 | DBG(2, "Device /dev/video%d is already in use", | 1794 | DBG(2, "Device /dev/video%d is already in use", |
1795 | cam->v4ldev->minor); | 1795 | cam->v4ldev->num); |
1796 | DBG(3, "Simultaneous opens are not supported"); | 1796 | DBG(3, "Simultaneous opens are not supported"); |
1797 | /* | 1797 | /* |
1798 | open() must follow the open flags and should block | 1798 | open() must follow the open flags and should block |
@@ -1845,7 +1845,7 @@ static int sn9c102_open(struct inode* inode, struct file* filp) | |||
1845 | cam->frame_count = 0; | 1845 | cam->frame_count = 0; |
1846 | sn9c102_empty_framequeues(cam); | 1846 | sn9c102_empty_framequeues(cam); |
1847 | 1847 | ||
1848 | DBG(3, "Video device /dev/video%d is open", cam->v4ldev->minor); | 1848 | DBG(3, "Video device /dev/video%d is open", cam->v4ldev->num); |
1849 | 1849 | ||
1850 | out: | 1850 | out: |
1851 | mutex_unlock(&cam->open_mutex); | 1851 | mutex_unlock(&cam->open_mutex); |
@@ -1870,7 +1870,7 @@ static int sn9c102_release(struct inode* inode, struct file* filp) | |||
1870 | cam->users--; | 1870 | cam->users--; |
1871 | wake_up_interruptible_nr(&cam->wait_open, 1); | 1871 | wake_up_interruptible_nr(&cam->wait_open, 1); |
1872 | 1872 | ||
1873 | DBG(3, "Video device /dev/video%d closed", cam->v4ldev->minor); | 1873 | DBG(3, "Video device /dev/video%d closed", cam->v4ldev->num); |
1874 | 1874 | ||
1875 | kref_put(&cam->kref, sn9c102_release_resources); | 1875 | kref_put(&cam->kref, sn9c102_release_resources); |
1876 | 1876 | ||
@@ -2432,7 +2432,7 @@ sn9c102_vidioc_s_crop(struct sn9c102_device* cam, void __user * arg) | |||
2432 | cam->state |= DEV_MISCONFIGURED; | 2432 | cam->state |= DEV_MISCONFIGURED; |
2433 | DBG(1, "VIDIOC_S_CROP failed because of hardware problems. To " | 2433 | DBG(1, "VIDIOC_S_CROP failed because of hardware problems. To " |
2434 | "use the camera, close and open /dev/video%d again.", | 2434 | "use the camera, close and open /dev/video%d again.", |
2435 | cam->v4ldev->minor); | 2435 | cam->v4ldev->num); |
2436 | return -EIO; | 2436 | return -EIO; |
2437 | } | 2437 | } |
2438 | 2438 | ||
@@ -2445,7 +2445,7 @@ sn9c102_vidioc_s_crop(struct sn9c102_device* cam, void __user * arg) | |||
2445 | cam->state |= DEV_MISCONFIGURED; | 2445 | cam->state |= DEV_MISCONFIGURED; |
2446 | DBG(1, "VIDIOC_S_CROP failed because of not enough memory. To " | 2446 | DBG(1, "VIDIOC_S_CROP failed because of not enough memory. To " |
2447 | "use the camera, close and open /dev/video%d again.", | 2447 | "use the camera, close and open /dev/video%d again.", |
2448 | cam->v4ldev->minor); | 2448 | cam->v4ldev->num); |
2449 | return -ENOMEM; | 2449 | return -ENOMEM; |
2450 | } | 2450 | } |
2451 | 2451 | ||
@@ -2689,7 +2689,7 @@ sn9c102_vidioc_try_s_fmt(struct sn9c102_device* cam, unsigned int cmd, | |||
2689 | cam->state |= DEV_MISCONFIGURED; | 2689 | cam->state |= DEV_MISCONFIGURED; |
2690 | DBG(1, "VIDIOC_S_FMT failed because of hardware problems. To " | 2690 | DBG(1, "VIDIOC_S_FMT failed because of hardware problems. To " |
2691 | "use the camera, close and open /dev/video%d again.", | 2691 | "use the camera, close and open /dev/video%d again.", |
2692 | cam->v4ldev->minor); | 2692 | cam->v4ldev->num); |
2693 | return -EIO; | 2693 | return -EIO; |
2694 | } | 2694 | } |
2695 | 2695 | ||
@@ -2701,7 +2701,7 @@ sn9c102_vidioc_try_s_fmt(struct sn9c102_device* cam, unsigned int cmd, | |||
2701 | cam->state |= DEV_MISCONFIGURED; | 2701 | cam->state |= DEV_MISCONFIGURED; |
2702 | DBG(1, "VIDIOC_S_FMT failed because of not enough memory. To " | 2702 | DBG(1, "VIDIOC_S_FMT failed because of not enough memory. To " |
2703 | "use the camera, close and open /dev/video%d again.", | 2703 | "use the camera, close and open /dev/video%d again.", |
2704 | cam->v4ldev->minor); | 2704 | cam->v4ldev->num); |
2705 | return -ENOMEM; | 2705 | return -ENOMEM; |
2706 | } | 2706 | } |
2707 | 2707 | ||
@@ -2748,7 +2748,7 @@ sn9c102_vidioc_s_jpegcomp(struct sn9c102_device* cam, void __user * arg) | |||
2748 | cam->state |= DEV_MISCONFIGURED; | 2748 | cam->state |= DEV_MISCONFIGURED; |
2749 | DBG(1, "VIDIOC_S_JPEGCOMP failed because of hardware " | 2749 | DBG(1, "VIDIOC_S_JPEGCOMP failed because of hardware " |
2750 | "problems. To use the camera, close and open " | 2750 | "problems. To use the camera, close and open " |
2751 | "/dev/video%d again.", cam->v4ldev->minor); | 2751 | "/dev/video%d again.", cam->v4ldev->num); |
2752 | return -EIO; | 2752 | return -EIO; |
2753 | } | 2753 | } |
2754 | 2754 | ||
@@ -3348,7 +3348,7 @@ sn9c102_usb_probe(struct usb_interface* intf, const struct usb_device_id* id) | |||
3348 | goto fail; | 3348 | goto fail; |
3349 | } | 3349 | } |
3350 | 3350 | ||
3351 | DBG(2, "V4L2 device registered as /dev/video%d", cam->v4ldev->minor); | 3351 | DBG(2, "V4L2 device registered as /dev/video%d", cam->v4ldev->num); |
3352 | 3352 | ||
3353 | video_set_drvdata(cam->v4ldev, cam); | 3353 | video_set_drvdata(cam->v4ldev, cam); |
3354 | cam->module_param.force_munmap = force_munmap[dev_nr]; | 3354 | cam->module_param.force_munmap = force_munmap[dev_nr]; |
@@ -3402,7 +3402,7 @@ static void sn9c102_usb_disconnect(struct usb_interface* intf) | |||
3402 | if (cam->users) { | 3402 | if (cam->users) { |
3403 | DBG(2, "Device /dev/video%d is open! Deregistration and " | 3403 | DBG(2, "Device /dev/video%d is open! Deregistration and " |
3404 | "memory deallocation are deferred.", | 3404 | "memory deallocation are deferred.", |
3405 | cam->v4ldev->minor); | 3405 | cam->v4ldev->num); |
3406 | cam->state |= DEV_MISCONFIGURED; | 3406 | cam->state |= DEV_MISCONFIGURED; |
3407 | sn9c102_stop_transfer(cam); | 3407 | sn9c102_stop_transfer(cam); |
3408 | cam->state |= DEV_DISCONNECTED; | 3408 | cam->state |= DEV_DISCONNECTED; |