Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into...

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / staging / media / bcm2048 / radio-bcm2048.c

diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c
index f28ffef..e9d0691 100644 (file)
--- a/drivers/staging/media/bcm2048/radio-bcm2048.c
+++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
@@ -279,7 +279,7 @@ struct region_info {
 
 struct bcm2048_device {
        struct i2c_client *client;
-       struct video_device *videodev;
+       struct video_device videodev;
        struct work_struct work;
        struct completion compl;
        struct mutex mutex;
@@ -1579,7 +1579,7 @@ static void bcm2048_parse_rt_match_d(struct bcm2048_device *bdev, int i,
                bcm2048_parse_rds_rt_block(bdev, i, index+2, crc);
 }
 
-static int bcm2048_parse_rds_rt(struct bcm2048_device *bdev)
+static void bcm2048_parse_rds_rt(struct bcm2048_device *bdev)
 {
        int i, index = 0, crc, match_b = 0, match_c = 0, match_d = 0;
 
@@ -1615,8 +1615,6 @@ static int bcm2048_parse_rds_rt(struct bcm2048_device *bdev)
                                        match_b = 1;
                }
        }
-
-       return 0;
 }
 
 static void bcm2048_parse_rds_ps_block(struct bcm2048_device *bdev, int i,
@@ -2273,7 +2271,7 @@ done:
  */
 static const struct v4l2_file_operations bcm2048_fops = {
        .owner          = THIS_MODULE,
-       .ioctl          = video_ioctl2,
+       .unlocked_ioctl = video_ioctl2,
        /* for RDS read support */
        .open           = bcm2048_fops_open,
        .release        = bcm2048_fops_release,
@@ -2584,7 +2582,7 @@ static struct v4l2_ioctl_ops bcm2048_ioctl_ops = {
 static struct video_device bcm2048_viddev_template = {
        .fops                   = &bcm2048_fops,
        .name                   = BCM2048_DRIVER_NAME,
-       .release                = video_device_release,
+       .release                = video_device_release_empty,
        .ioctl_ops              = &bcm2048_ioctl_ops,
 };
 
@@ -2603,13 +2601,6 @@ static int bcm2048_i2c_driver_probe(struct i2c_client *client,
                goto exit;
        }
 
-       bdev->videodev = video_device_alloc();
-       if (!bdev->videodev) {
-               dev_dbg(&client->dev, "Failed to alloc video device.\n");
-               err = -ENOMEM;
-               goto free_bdev;
-       }
-
        bdev->client = client;
        i2c_set_clientdata(client, bdev);
        mutex_init(&bdev->mutex);
@@ -2622,16 +2613,16 @@ static int bcm2048_i2c_driver_probe(struct i2c_client *client,
                        client->name, bdev);
                if (err < 0) {
                        dev_err(&client->dev, "Could not request IRQ\n");
-                       goto free_vdev;
+                       goto free_bdev;
                }
                dev_dbg(&client->dev, "IRQ requested.\n");
        } else {
                dev_dbg(&client->dev, "IRQ not configured. Using timeouts.\n");
        }
 
-       *bdev->videodev = bcm2048_viddev_template;
-       video_set_drvdata(bdev->videodev, bdev);
-       if (video_register_device(bdev->videodev, VFL_TYPE_RADIO, radio_nr)) {
+       bdev->videodev = bcm2048_viddev_template;
+       video_set_drvdata(&bdev->videodev, bdev);
+       if (video_register_device(&bdev->videodev, VFL_TYPE_RADIO, radio_nr)) {
                dev_dbg(&client->dev, "Could not register video device.\n");
                err = -EIO;
                goto free_irq;
@@ -2654,18 +2645,13 @@ static int bcm2048_i2c_driver_probe(struct i2c_client *client,
 free_sysfs:
        bcm2048_sysfs_unregister_properties(bdev, ARRAY_SIZE(attrs));
 free_registration:
-       video_unregister_device(bdev->videodev);
-       /* video_unregister_device frees bdev->videodev */
-       bdev->videodev = NULL;
+       video_unregister_device(&bdev->videodev);
        skip_release = 1;
 free_irq:
        if (client->irq)
                free_irq(client->irq, bdev);
-free_vdev:
-       if (!skip_release)
-               video_device_release(bdev->videodev);
-       i2c_set_clientdata(client, NULL);
 free_bdev:
+       i2c_set_clientdata(client, NULL);
        kfree(bdev);
 exit:
        return err;
@@ -2674,16 +2660,13 @@ exit:
 static int __exit bcm2048_i2c_driver_remove(struct i2c_client *client)
 {
        struct bcm2048_device *bdev = i2c_get_clientdata(client);
-       struct video_device *vd;
 
        if (!client->adapter)
                return -ENODEV;
 
        if (bdev) {
-               vd = bdev->videodev;
-
                bcm2048_sysfs_unregister_properties(bdev, ARRAY_SIZE(attrs));
-               video_unregister_device(vd);
+               video_unregister_device(&bdev->videodev);
 
                if (bdev->power_state)
                        bcm2048_set_power_state(bdev, BCM2048_POWER_OFF);