[media] radio-si470x: Add support for the new band APIs

[~andy/linux] / drivers / media / radio / si470x / radio-si470x-i2c.c

diff --git a/drivers/media/radio/si470x/radio-si470x-i2c.c b/drivers/media/radio/si470x/radio-si470x-i2c.c
index 9b546a5523f3591aa22a65976724dfba4206ee74..643a6ff7c5d0e629e70112c0c4e67fe0459c580b 100644 (file)
--- a/drivers/media/radio/si470x/radio-si470x-i2c.c
+++ b/drivers/media/radio/si470x/radio-si470x-i2c.c
@@ -161,20 +161,6 @@ static int si470x_get_all_registers(struct si470x_device *radio)
 
 
 
-/**************************************************************************
- * General Driver Functions - DISCONNECT_CHECK
- **************************************************************************/
-
-/*
- * si470x_disconnect_check - check whether radio disconnects
- */
-int si470x_disconnect_check(struct si470x_device *radio)
-{
-       return 0;
-}
-
-
-
 /**************************************************************************
  * File Operations Interface
  **************************************************************************/
@@ -185,12 +171,12 @@ int si470x_disconnect_check(struct si470x_device *radio)
 int si470x_fops_open(struct file *file)
 {
        struct si470x_device *radio = video_drvdata(file);
-       int retval = 0;
+       int retval = v4l2_fh_open(file);
 
-       mutex_lock(&radio->lock);
-       radio->users++;
+       if (retval)
+               return retval;
 
-       if (radio->users == 1) {
+       if (v4l2_fh_is_singular_file(file)) {
                /* start radio */
                retval = si470x_start(radio);
                if (retval < 0)
@@ -205,7 +191,8 @@ int si470x_fops_open(struct file *file)
        }
 
 done:
-       mutex_unlock(&radio->lock);
+       if (retval)
+               v4l2_fh_release(file);
        return retval;
 }
 
@@ -216,21 +203,12 @@ done:
 int si470x_fops_release(struct file *file)
 {
        struct si470x_device *radio = video_drvdata(file);
-       int retval = 0;
 
-       /* safety check */
-       if (!radio)
-               return -ENODEV;
-
-       mutex_lock(&radio->lock);
-       radio->users--;
-       if (radio->users == 0)
+       if (v4l2_fh_is_singular_file(file))
                /* stop radio */
-               retval = si470x_stop(radio);
-
-       mutex_unlock(&radio->lock);
+               si470x_stop(radio);
 
-       return retval;
+       return v4l2_fh_release(file);
 }
 
 
@@ -371,32 +349,27 @@ static int __devinit si470x_i2c_probe(struct i2c_client *client,
                goto err_initial;
        }
 
-       radio->users = 0;
        radio->client = client;
+       radio->band = 1; /* Default to 76 - 108 MHz */
        mutex_init(&radio->lock);
+       init_completion(&radio->completion);
 
-       /* video device allocation and initialization */
-       radio->videodev = video_device_alloc();
-       if (!radio->videodev) {
-               retval = -ENOMEM;
-               goto err_radio;
-       }
-       memcpy(radio->videodev, &si470x_viddev_template,
-                       sizeof(si470x_viddev_template));
-       video_set_drvdata(radio->videodev, radio);
+       /* video device initialization */
+       radio->videodev = si470x_viddev_template;
+       video_set_drvdata(&radio->videodev, radio);
 
        /* power up : need 110ms */
        radio->registers[POWERCFG] = POWERCFG_ENABLE;
        if (si470x_set_register(radio, POWERCFG) < 0) {
                retval = -EIO;
-               goto err_video;
+               goto err_radio;
        }
        msleep(110);
 
        /* get device and chip versions */
        if (si470x_get_all_registers(radio) < 0) {
                retval = -EIO;
-               goto err_video;
+               goto err_radio;
        }
        dev_info(&client->dev, "DeviceID=0x%4.4hx ChipID=0x%4.4hx\n",
                        radio->registers[DEVICEID], radio->registers[CHIPID]);
@@ -427,7 +400,7 @@ static int __devinit si470x_i2c_probe(struct i2c_client *client,
        radio->buffer = kmalloc(radio->buf_size, GFP_KERNEL);
        if (!radio->buffer) {
                retval = -EIO;
-               goto err_video;
+               goto err_radio;
        }
 
        /* rds buffer configuration */
@@ -435,10 +408,6 @@ static int __devinit si470x_i2c_probe(struct i2c_client *client,
        radio->rd_index = 0;
        init_waitqueue_head(&radio->read_queue);
 
-       /* mark Seek/Tune Complete Interrupt enabled */
-       radio->stci_enabled = true;
-       init_completion(&radio->completion);
-
        retval = request_threaded_irq(client->irq, NULL, si470x_i2c_interrupt,
                        IRQF_TRIGGER_FALLING, DRIVER_NAME, radio);
        if (retval) {
@@ -447,7 +416,7 @@ static int __devinit si470x_i2c_probe(struct i2c_client *client,
        }
 
        /* register video device */
-       retval = video_register_device(radio->videodev, VFL_TYPE_RADIO,
+       retval = video_register_device(&radio->videodev, VFL_TYPE_RADIO,
                        radio_nr);
        if (retval) {
                dev_warn(&client->dev, "Could not register video device\n");
@@ -460,8 +429,6 @@ err_all:
        free_irq(client->irq, radio);
 err_rds:
        kfree(radio->buffer);
-err_video:
-       video_device_release(radio->videodev);
 err_radio:
        kfree(radio);
 err_initial:
@@ -477,7 +444,7 @@ static __devexit int si470x_i2c_remove(struct i2c_client *client)
        struct si470x_device *radio = i2c_get_clientdata(client);
 
        free_irq(client->irq, radio);
-       video_unregister_device(radio->videodev);
+       video_unregister_device(&radio->videodev);
        kfree(radio);
 
        return 0;