V4L/DVB: radio-am800: let v4l2_device_(un)register handle usb_get/set_intfdata

[safe/jmp/linux-2.6] / drivers / media / radio / radio-mr800.c

diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
index 5506fac..353b828 100644 (file)
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -28,7 +28,7 @@
  * http://av-usbradio.sourceforge.net/index.php
  * http://sourceforge.net/projects/av-usbradio/
  * Latest release of theirs project was in 2005.
- * Probably, this driver could be improved trough using their
+ * Probably, this driver could be improved through using their
  * achievements (specifications given).
  * Also, Faidon Liambotis <paravoid@debian.org> wrote nice driver for this radio
  * in 2007. He allowed to use his driver to improve current mr800 radio driver.
@@ -132,6 +132,7 @@ static int usb_amradio_resume(struct usb_interface *intf);
 struct amradio_device {
        /* reference to USB and video device */
        struct usb_device *usbdev;
+       struct usb_interface *intf;
        struct video_device videodev;
        struct v4l2_device v4l2_dev;
 
@@ -143,7 +144,10 @@ struct amradio_device {
        int initialized;
 };
 
-#define vdev_to_amradio(r) container_of(r, struct amradio_device, videodev)
+static inline struct amradio_device *to_amradio_dev(struct v4l2_device *v4l2_dev)
+{
+       return container_of(v4l2_dev, struct amradio_device, v4l2_dev);
+}
 
 /* USB Device ID List */
 static struct usb_device_id usb_amradio_device_table[] = {
@@ -163,7 +167,7 @@ static struct usb_driver usb_amradio_driver = {
        .resume                 = usb_amradio_resume,
        .reset_resume           = usb_amradio_resume,
        .id_table               = usb_amradio_device_table,
-       .supports_autosuspend   = 0,
+       .supports_autosuspend   = 1,
 };
 
 /* switch on/off the radio. Send 8 bytes to device */
@@ -235,6 +239,7 @@ static int amradio_setfreq(struct amradio_device *radio, int freq)
        if (retval < 0 || size != BUFFER_LENGTH)
                goto out_err;
 
+       radio->curfreq = freq;
        goto out;
 
 out_err:
@@ -282,13 +287,12 @@ static int amradio_set_stereo(struct amradio_device *radio, char argument)
  */
 static void usb_amradio_disconnect(struct usb_interface *intf)
 {
-       struct amradio_device *radio = usb_get_intfdata(intf);
+       struct amradio_device *radio = to_amradio_dev(usb_get_intfdata(intf));
 
        mutex_lock(&radio->lock);
        radio->usbdev = NULL;
        mutex_unlock(&radio->lock);
 
-       usb_set_intfdata(intf, NULL);
        v4l2_device_disconnect(&radio->v4l2_dev);
        video_unregister_device(&radio->videodev);
 }
@@ -371,13 +375,10 @@ static int vidioc_s_frequency(struct file *file, void *priv,
                                struct v4l2_frequency *f)
 {
        struct amradio_device *radio = file->private_data;
-       int retval = 0;
-
-       radio->curfreq = f->frequency;
 
-       retval = amradio_setfreq(radio, radio->curfreq);
-
-       return retval;
+       if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
+               return -EINVAL;
+       return amradio_setfreq(radio, f->frequency);
 }
 
 /* vidioc_g_frequency - get tuner radio frequency */
@@ -386,6 +387,8 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 {
        struct amradio_device *radio = file->private_data;
 
+       if (f->tuner != 0)
+               return -EINVAL;
        f->type = V4L2_TUNER_RADIO;
        f->frequency = radio->curfreq;
 
@@ -499,7 +502,7 @@ out:
 /* open device - amradio_start() and amradio_setfreq() */
 static int usb_amradio_open(struct file *file)
 {
-       struct amradio_device *radio = vdev_to_amradio(video_devdata(file));
+       struct amradio_device *radio = video_drvdata(file);
        int retval = 0;
 
        mutex_lock(&radio->lock);
@@ -510,9 +513,15 @@ static int usb_amradio_open(struct file *file)
        }
 
        file->private_data = radio;
+       retval = usb_autopm_get_interface(radio->intf);
+       if (retval)
+               goto unlock;
 
-       if (unlikely(!radio->initialized))
+       if (unlikely(!radio->initialized)) {
                retval = usb_amradio_init(radio);
+               if (retval)
+                       usb_autopm_put_interface(radio->intf);
+       }
 
 unlock:
        mutex_unlock(&radio->lock);
@@ -529,6 +538,8 @@ static int usb_amradio_close(struct file *file)
 
        if (!radio->usbdev)
                retval = -EIO;
+       else
+               usb_autopm_put_interface(radio->intf);
 
        mutex_unlock(&radio->lock);
        return retval;
@@ -557,7 +568,7 @@ unlock:
 /* Suspend device - stop device. Need to be checked and fixed */
 static int usb_amradio_suspend(struct usb_interface *intf, pm_message_t message)
 {
-       struct amradio_device *radio = usb_get_intfdata(intf);
+       struct amradio_device *radio = to_amradio_dev(usb_get_intfdata(intf));
 
        mutex_lock(&radio->lock);
 
@@ -575,7 +586,7 @@ static int usb_amradio_suspend(struct usb_interface *intf, pm_message_t message)
 /* Resume device - start device. Need to be checked and fixed */
 static int usb_amradio_resume(struct usb_interface *intf)
 {
-       struct amradio_device *radio = usb_get_intfdata(intf);
+       struct amradio_device *radio = to_amradio_dev(usb_get_intfdata(intf));
 
        mutex_lock(&radio->lock);
 
@@ -624,9 +635,7 @@ static const struct v4l2_ioctl_ops usb_amradio_ioctl_ops = {
 
 static void usb_amradio_video_device_release(struct video_device *videodev)
 {
-       struct amradio_device *radio = vdev_to_amradio(videodev);
-
-       v4l2_device_unregister(&radio->v4l2_dev);
+       struct amradio_device *radio = video_get_drvdata(videodev);
 
        /* free rest memory */
        kfree(radio->buffer);
@@ -670,6 +679,7 @@ static int usb_amradio_probe(struct usb_interface *intf,
        radio->videodev.release = usb_amradio_video_device_release;
 
        radio->usbdev = interface_to_usbdev(intf);
+       radio->intf = intf;
        radio->curfreq = 95.16 * FREQ_MUL;
 
        mutex_init(&radio->lock);
@@ -683,7 +693,6 @@ static int usb_amradio_probe(struct usb_interface *intf,
                goto err_vdev;
        }
 
-       usb_set_intfdata(intf, radio);
        return 0;
 
 err_vdev: