USB: remove warn() macro from usb media drivers

[linux-2.6-omap-h63xx.git] / drivers / media / radio / dsbr100.c

diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index 70c65a745923f088b96e2e8d0da59e3f7865ef25..78f56944e640f53b53e37273f436ac3490e045db 100644 (file)
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -274,7 +274,7 @@ static int vidioc_querycap(struct file *file, void *priv,
 static int vidioc_g_tuner(struct file *file, void *priv,
                                struct v4l2_tuner *v)
 {
-       struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
+       struct dsbr100_device *radio = video_drvdata(file);
 
        if (v->index > 0)
                return -EINVAL;
@@ -306,18 +306,18 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 static int vidioc_s_frequency(struct file *file, void *priv,
                                struct v4l2_frequency *f)
 {
-       struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
+       struct dsbr100_device *radio = video_drvdata(file);
 
        radio->curfreq = f->frequency;
        if (dsbr100_setfreq(radio, radio->curfreq)==-1)
-               warn("Set frequency failed");
+               dev_warn(&radio->usbdev->dev, "Set frequency failed\n");
        return 0;
 }
 
 static int vidioc_g_frequency(struct file *file, void *priv,
                                struct v4l2_frequency *f)
 {
-       struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
+       struct dsbr100_device *radio = video_drvdata(file);
 
        f->type = V4L2_TUNER_RADIO;
        f->frequency = radio->curfreq;
@@ -342,7 +342,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 static int vidioc_g_ctrl(struct file *file, void *priv,
                                struct v4l2_control *ctrl)
 {
-       struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
+       struct dsbr100_device *radio = video_drvdata(file);
 
        switch (ctrl->id) {
        case V4L2_CID_AUDIO_MUTE:
@@ -355,16 +355,22 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
 static int vidioc_s_ctrl(struct file *file, void *priv,
                                struct v4l2_control *ctrl)
 {
-       struct dsbr100_device *radio = video_get_drvdata(video_devdata(file));
+       struct dsbr100_device *radio = video_drvdata(file);
 
        switch (ctrl->id) {
        case V4L2_CID_AUDIO_MUTE:
                if (ctrl->value) {
-                       if (dsbr100_stop(radio)==-1)
-                               warn("Radio did not respond properly");
+                       if (dsbr100_stop(radio) == -1) {
+                               dev_warn(&radio->usbdev->dev,
+                                        "Radio did not respond properly\n");
+                               return -EBUSY;
+                       }
                } else {
-                       if (dsbr100_start(radio)==-1)
-                               warn("Radio did not respond properly");
+                       if (dsbr100_start(radio) == -1) {
+                               dev_warn(&radio->usbdev->dev,
+                                        "Radio did not respond properly\n");
+                               return -EBUSY;
+                       }
                }
                return 0;
        }
@@ -405,23 +411,27 @@ static int vidioc_s_audio(struct file *file, void *priv,
 
 static int usb_dsbr100_open(struct inode *inode, struct file *file)
 {
-       struct dsbr100_device *radio=video_get_drvdata(video_devdata(file));
+       struct dsbr100_device *radio = video_drvdata(file);
 
+       lock_kernel();
        radio->users = 1;
        radio->muted = 1;
 
        if (dsbr100_start(radio)<0) {
-               warn("Radio did not start up properly");
+               dev_warn(&radio->usbdev->dev,
+                        "Radio did not start up properly\n");
                radio->users = 0;
+               unlock_kernel();
                return -EIO;
        }
        dsbr100_setfreq(radio, radio->curfreq);
+       unlock_kernel();
        return 0;
 }
 
 static int usb_dsbr100_close(struct inode *inode, struct file *file)
 {
-       struct dsbr100_device *radio=video_get_drvdata(video_devdata(file));
+       struct dsbr100_device *radio = video_drvdata(file);
 
        if (!radio)
                return -ENODEV;
@@ -494,7 +504,7 @@ static int usb_dsbr100_probe(struct usb_interface *intf,
        radio->curfreq = FREQ_MIN*FREQ_MUL;
        video_set_drvdata(radio->videodev, radio);
        if (video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr) < 0) {
-               warn("Could not register video device");
+               dev_warn(&intf->dev, "Could not register video device\n");
                video_device_release(radio->videodev);
                kfree(radio->transfer_buffer);
                kfree(radio);
@@ -507,7 +517,8 @@ static int usb_dsbr100_probe(struct usb_interface *intf,
 static int __init dsbr100_init(void)
 {
        int retval = usb_register(&usb_dsbr100_driver);
-       info(DRIVER_VERSION ":" DRIVER_DESC);
+       printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
+              DRIVER_DESC "\n");
        return retval;
 }