aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Klimov <klimov.linux@gmail.com>2009-06-10 23:18:35 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-16 18:07:35 -0400
commita617e0e8c7a94dc796d9887ffed621564553c5b8 (patch)
treec481af1ae16f0eeed9a4135ba28f7f0a902b6937
parent6f094eb9a860bcde45984e8ab87965f39ceda427 (diff)
V4L/DVB (11955): dsbr100: remove usb_dsbr100_open/close calls
Signed-off-by: Alexey Klimov <klimov.linux@gmail.com> Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/radio/dsbr100.c48
1 files changed, 0 insertions, 48 deletions
diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index 2852242e07eb..0bd2191fb766 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -126,8 +126,6 @@ devices, that would be 76 and 91. */
126static int usb_dsbr100_probe(struct usb_interface *intf, 126static int usb_dsbr100_probe(struct usb_interface *intf,
127 const struct usb_device_id *id); 127 const struct usb_device_id *id);
128static void usb_dsbr100_disconnect(struct usb_interface *intf); 128static void usb_dsbr100_disconnect(struct usb_interface *intf);
129static int usb_dsbr100_open(struct file *file);
130static int usb_dsbr100_close(struct file *file);
131static int usb_dsbr100_suspend(struct usb_interface *intf, 129static int usb_dsbr100_suspend(struct usb_interface *intf,
132 pm_message_t message); 130 pm_message_t message);
133static int usb_dsbr100_resume(struct usb_interface *intf); 131static int usb_dsbr100_resume(struct usb_interface *intf);
@@ -542,50 +540,6 @@ static int vidioc_s_audio(struct file *file, void *priv,
542 return 0; 540 return 0;
543} 541}
544 542
545static int usb_dsbr100_open(struct file *file)
546{
547 struct dsbr100_device *radio = video_drvdata(file);
548 int retval;
549
550 lock_kernel();
551 radio->muted = 1;
552
553 retval = dsbr100_start(radio);
554 if (retval < 0) {
555 dev_warn(&radio->usbdev->dev,
556 "Radio did not start up properly\n");
557 unlock_kernel();
558 return -EIO;
559 }
560
561 retval = dsbr100_setfreq(radio, radio->curfreq);
562 if (retval < 0)
563 dev_warn(&radio->usbdev->dev,
564 "set frequency failed\n");
565
566 unlock_kernel();
567 return 0;
568}
569
570static int usb_dsbr100_close(struct file *file)
571{
572 struct dsbr100_device *radio = video_drvdata(file);
573 int retval;
574
575 if (!radio)
576 return -ENODEV;
577
578 if (!radio->removed) {
579 retval = dsbr100_stop(radio);
580 if (retval < 0) {
581 dev_warn(&radio->usbdev->dev,
582 "dsbr100_stop failed\n");
583 }
584
585 }
586 return 0;
587}
588
589/* Suspend device - stop device. */ 543/* Suspend device - stop device. */
590static int usb_dsbr100_suspend(struct usb_interface *intf, pm_message_t message) 544static int usb_dsbr100_suspend(struct usb_interface *intf, pm_message_t message)
591{ 545{
@@ -629,8 +583,6 @@ static void usb_dsbr100_video_device_release(struct video_device *videodev)
629/* File system interface */ 583/* File system interface */
630static const struct v4l2_file_operations usb_dsbr100_fops = { 584static const struct v4l2_file_operations usb_dsbr100_fops = {
631 .owner = THIS_MODULE, 585 .owner = THIS_MODULE,
632 .open = usb_dsbr100_open,
633 .release = usb_dsbr100_close,
634 .ioctl = video_ioctl2, 586 .ioctl = video_ioctl2,
635}; 587};
636 588