V4L/DVB (10891): radio-trust: convert to v4l2_device.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 179 insertions, 165 deletions

diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c
index bdf9cb6a75f4..fe964b45fdf5 100644
--- a/drivers/media/radio/radio-trust.c
+++ b/drivers/media/radio/radio-trust.c
@@ -19,49 +19,16 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
 #include <linux/videodev2.h>
-#include <media/v4l2-common.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
+#include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
 
-#include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
-#define RADIO_VERSION KERNEL_VERSION(0,0,2)
-
-static struct v4l2_queryctrl radio_qctrl[] = {
-        {
-                .id            = V4L2_CID_AUDIO_MUTE,
-                .name          = "Mute",
-                .minimum       = 0,
-                .maximum       = 1,
-                .default_value = 1,
-                .type          = V4L2_CTRL_TYPE_BOOLEAN,
-        },{
-                .id            = V4L2_CID_AUDIO_VOLUME,
-                .name          = "Volume",
-                .minimum       = 0,
-                .maximum       = 65535,
-                .step          = 2048,
-                .default_value = 65535,
-                .type          = V4L2_CTRL_TYPE_INTEGER,
-        },{
-                .id            = V4L2_CID_AUDIO_BASS,
-                .name          = "Bass",
-                .minimum       = 0,
-                .maximum       = 65535,
-                .step          = 4370,
-                .default_value = 32768,
-                .type          = V4L2_CTRL_TYPE_INTEGER,
-        },{
-                .id            = V4L2_CID_AUDIO_TREBLE,
-                .name          = "Treble",
-                .minimum       = 0,
-                .maximum       = 65535,
-                .step          = 4370,
-                .default_value = 32768,
-                .type          = V4L2_CTRL_TYPE_INTEGER,
-        },
-};
+MODULE_AUTHOR("Eric Lammerts, Russell Kroll, Quay Lu, Donald Song, Jason Lewis, Scott McGrath, William McGrath");
+MODULE_DESCRIPTION("A driver for the Trust FM Radio card.");
+MODULE_LICENSE("GPL");
 
 /* acceptable ports: 0x350 (JP3 shorted), 0x358 (JP3 open) */
 
@@ -71,26 +38,41 @@ static struct v4l2_queryctrl radio_qctrl[] = {
 
 static int io = CONFIG_RADIO_TRUST_PORT;
 static int radio_nr = -1;
-static int ioval = 0xf;
-static __u16 curvol;
-static __u16 curbass;
-static __u16 curtreble;
-static unsigned long curfreq;
-static int curstereo;
-static int curmute;
-static unsigned long in_use;
+
+module_param(io, int, 0);
+MODULE_PARM_DESC(io, "I/O address of the Trust FM Radio card (0x350 or 0x358)");
+module_param(radio_nr, int, 0);
+
+#define RADIO_VERSION KERNEL_VERSION(0, 0, 2)
+
+struct trust {
+        struct v4l2_device v4l2_dev;
+        struct video_device vdev;
+        int io;
+        int ioval;
+        __u16 curvol;
+        __u16 curbass;
+        __u16 curtreble;
+        int muted;
+        unsigned long curfreq;
+        int curstereo;
+        int curmute;
+        struct mutex lock;
+};
+
+static struct trust trust_card;
 
 /* i2c addresses */
 #define TDA7318_ADDR 0x88
 #define TSA6060T_ADDR 0xc4
 
-#define TR_DELAY do { inb(io); inb(io); inb(io); } while(0)
-#define TR_SET_SCL outb(ioval |= 2, io)
-#define TR_CLR_SCL outb(ioval &= 0xfd, io)
-#define TR_SET_SDA outb(ioval |= 1, io)
-#define TR_CLR_SDA outb(ioval &= 0xfe, io)
+#define TR_DELAY do { inb(tr->io); inb(tr->io); inb(tr->io); } while (0)
+#define TR_SET_SCL outb(tr->ioval |= 2, tr->io)
+#define TR_CLR_SCL outb(tr->ioval &= 0xfd, tr->io)
+#define TR_SET_SDA outb(tr->ioval |= 1, tr->io)
+#define TR_CLR_SDA outb(tr->ioval &= 0xfe, tr->io)
 
-static void write_i2c(int n, ...)
+static void write_i2c(struct trust *tr, int n, ...)
 {
         unsigned char val, mask;
         va_list args;
@@ -136,62 +118,77 @@ static void write_i2c(int n, ...)
         va_end(args);
 }
 
-static void tr_setvol(__u16 vol)
+static void tr_setvol(struct trust *tr, __u16 vol)
 {
-        curvol = vol / 2048;
-        write_i2c(2, TDA7318_ADDR, curvol ^ 0x1f);
+        mutex_lock(&tr->lock);
+        tr->curvol = vol / 2048;
+        write_i2c(tr, 2, TDA7318_ADDR, tr->curvol ^ 0x1f);
+        mutex_unlock(&tr->lock);
 }
 
 static int basstreble2chip[15] = {
         0, 1, 2, 3, 4, 5, 6, 7, 14, 13, 12, 11, 10, 9, 8
 };
 
-static void tr_setbass(__u16 bass)
+static void tr_setbass(struct trust *tr, __u16 bass)
 {
-        curbass = bass / 4370;
-        write_i2c(2, TDA7318_ADDR, 0x60 | basstreble2chip[curbass]);
+        mutex_lock(&tr->lock);
+        tr->curbass = bass / 4370;
+        write_i2c(tr, 2, TDA7318_ADDR, 0x60 | basstreble2chip[tr->curbass]);
+        mutex_unlock(&tr->lock);
 }
 
-static void tr_settreble(__u16 treble)
+static void tr_settreble(struct trust *tr, __u16 treble)
 {
-        curtreble = treble / 4370;
-        write_i2c(2, TDA7318_ADDR, 0x70 | basstreble2chip[curtreble]);
+        mutex_lock(&tr->lock);
+        tr->curtreble = treble / 4370;
+        write_i2c(tr, 2, TDA7318_ADDR, 0x70 | basstreble2chip[tr->curtreble]);
+        mutex_unlock(&tr->lock);
 }
 
-static void tr_setstereo(int stereo)
+static void tr_setstereo(struct trust *tr, int stereo)
 {
-        curstereo = !!stereo;
-        ioval = (ioval & 0xfb) | (!curstereo << 2);
-        outb(ioval, io);
+        mutex_lock(&tr->lock);
+        tr->curstereo = !!stereo;
+        tr->ioval = (tr->ioval & 0xfb) | (!tr->curstereo << 2);
+        outb(tr->ioval, tr->io);
+        mutex_unlock(&tr->lock);
 }
 
-static void tr_setmute(int mute)
+static void tr_setmute(struct trust *tr, int mute)
 {
-        curmute = !!mute;
-        ioval = (ioval & 0xf7) | (curmute << 3);
-        outb(ioval, io);
+        mutex_lock(&tr->lock);
+        tr->curmute = !!mute;
+        tr->ioval = (tr->ioval & 0xf7) | (tr->curmute << 3);
+        outb(tr->ioval, tr->io);
+        mutex_unlock(&tr->lock);
 }
 
-static int tr_getsigstr(void)
+static int tr_getsigstr(struct trust *tr)
 {
         int i, v;
 
-        for(i = 0, v = 0; i < 100; i++) v |= inb(io);
-        return (v & 1)? 0 : 0xffff;
+        mutex_lock(&tr->lock);
+        for (i = 0, v = 0; i < 100; i++)
+                v |= inb(tr->io);
+        mutex_unlock(&tr->lock);
+        return (v & 1) ? 0 : 0xffff;
 }
 
-static int tr_getstereo(void)
+static int tr_getstereo(struct trust *tr)
 {
         /* don't know how to determine it, just return the setting */
-        return curstereo;
+        return tr->curstereo;
 }
 
-static void tr_setfreq(unsigned long f)
+static void tr_setfreq(struct trust *tr, unsigned long f)
 {
+        mutex_lock(&tr->lock);
+        tr->curfreq = f;
         f /= 160;       /* Convert to 10 kHz units      */
-        f += 1070;      /* Add 10.7 MHz IF                      */
-
-        write_i2c(5, TSA6060T_ADDR, (f << 1) | 1, f >> 7, 0x60 | ((f >> 15) & 1), 0);
+        f += 1070;      /* Add 10.7 MHz IF              */
+        write_i2c(tr, 5, TSA6060T_ADDR, (f << 1) | 1, f >> 7, 0x60 | ((f >> 15) & 1), 0);
+        mutex_unlock(&tr->lock);
 }
 
 static int vidioc_querycap(struct file *file, void *priv,
@@ -199,68 +196,75 @@ static int vidioc_querycap(struct file *file, void *priv,
 {
         strlcpy(v->driver, "radio-trust", sizeof(v->driver));
         strlcpy(v->card, "Trust FM Radio", sizeof(v->card));
-        sprintf(v->bus_info, "ISA");
+        strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));
         v->version = RADIO_VERSION;
-        v->capabilities = V4L2_CAP_TUNER;
+        v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
         return 0;
 }
 
 static int vidioc_g_tuner(struct file *file, void *priv,
                                 struct v4l2_tuner *v)
 {
+        struct trust *tr = video_drvdata(file);
+
         if (v->index > 0)
                 return -EINVAL;
 
-        strcpy(v->name, "FM");
+        strlcpy(v->name, "FM", sizeof(v->name));
         v->type = V4L2_TUNER_RADIO;
-        v->rangelow = (87.5*16000);
-        v->rangehigh = (108*16000);
-        v->rxsubchans = V4L2_TUNER_SUB_MONO|V4L2_TUNER_SUB_STEREO;
+        v->rangelow = 87.5 * 16000;
+        v->rangehigh = 108 * 16000;
+        v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
         v->capability = V4L2_TUNER_CAP_LOW;
-        if (tr_getstereo())
+        if (tr_getstereo(tr))
                 v->audmode = V4L2_TUNER_MODE_STEREO;
         else
                 v->audmode = V4L2_TUNER_MODE_MONO;
-        v->signal = tr_getsigstr();
+        v->signal = tr_getsigstr(tr);
         return 0;
 }
 
 static int vidioc_s_tuner(struct file *file, void *priv,
                                 struct v4l2_tuner *v)
 {
-        if (v->index > 0)
-                return -EINVAL;
+        struct trust *tr = video_drvdata(file);
 
+        if (v->index)
+                return -EINVAL;
+        tr_setstereo(tr, v->audmode == V4L2_TUNER_MODE_STEREO);
         return 0;
 }
 
 static int vidioc_s_frequency(struct file *file, void *priv,
                                 struct v4l2_frequency *f)
 {
-        curfreq = f->frequency;
-        tr_setfreq(curfreq);
+        struct trust *tr = video_drvdata(file);
+
+        tr_setfreq(tr, f->frequency);
         return 0;
 }
 
 static int vidioc_g_frequency(struct file *file, void *priv,
                                 struct v4l2_frequency *f)
 {
+        struct trust *tr = video_drvdata(file);
+
         f->type = V4L2_TUNER_RADIO;
-        f->frequency = curfreq;
+        f->frequency = tr->curfreq;
         return 0;
 }
 
 static int vidioc_queryctrl(struct file *file, void *priv,
                                 struct v4l2_queryctrl *qc)
 {
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) {
-                if (qc->id && qc->id == radio_qctrl[i].id) {
-                        memcpy(qc, &(radio_qctrl[i]),
-                                                sizeof(*qc));
-                        return 0;
-                }
+        switch (qc->id) {
+        case V4L2_CID_AUDIO_MUTE:
+                return v4l2_ctrl_query_fill(qc, 0, 1, 1, 1);
+        case V4L2_CID_AUDIO_VOLUME:
+                return v4l2_ctrl_query_fill(qc, 0, 65535, 2048, 65535);
+        case V4L2_CID_AUDIO_BASS:
+        case V4L2_CID_AUDIO_TREBLE:
+                return v4l2_ctrl_query_fill(qc, 0, 65535, 4370, 32768);
         }
         return -EINVAL;
 }
@@ -268,18 +272,20 @@ static int vidioc_queryctrl(struct file *file, void *priv,
 static int vidioc_g_ctrl(struct file *file, void *priv,
                                 struct v4l2_control *ctrl)
 {
+        struct trust *tr = video_drvdata(file);
+
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
-                ctrl->value = curmute;
+                ctrl->value = tr->curmute;
                 return 0;
         case V4L2_CID_AUDIO_VOLUME:
-                ctrl->value = curvol * 2048;
+                ctrl->value = tr->curvol * 2048;
                 return 0;
         case V4L2_CID_AUDIO_BASS:
-                ctrl->value = curbass * 4370;
+                ctrl->value = tr->curbass * 4370;
                 return 0;
         case V4L2_CID_AUDIO_TREBLE:
-                ctrl->value = curtreble * 4370;
+                ctrl->value = tr->curtreble * 4370;
                 return 0;
         }
         return -EINVAL;
@@ -288,34 +294,25 @@ 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 trust *tr = video_drvdata(file);
+
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
-                tr_setmute(ctrl->value);
+                tr_setmute(tr, ctrl->value);
                 return 0;
         case V4L2_CID_AUDIO_VOLUME:
-                tr_setvol(ctrl->value);
+                tr_setvol(tr, ctrl->value);
                 return 0;
         case V4L2_CID_AUDIO_BASS:
-                tr_setbass(ctrl->value);
+                tr_setbass(tr, ctrl->value);
                 return 0;
         case V4L2_CID_AUDIO_TREBLE:
-                tr_settreble(ctrl->value);
+                tr_settreble(tr, ctrl->value);
                 return 0;
         }
         return -EINVAL;
 }
 
-static int vidioc_g_audio(struct file *file, void *priv,
-                                struct v4l2_audio *a)
-{
-        if (a->index > 1)
-                return -EINVAL;
-
-        strcpy(a->name, "Radio");
-        a->capability = V4L2_AUDCAP_STEREO;
-        return 0;
-}
-
 static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i)
 {
         *i = 0;
@@ -324,34 +321,38 @@ static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i)
 
 static int vidioc_s_input(struct file *filp, void *priv, unsigned int i)
 {
-        if (i != 0)
-                return -EINVAL;
+        return i ? -EINVAL : 0;
+}
+
+static int vidioc_g_audio(struct file *file, void *priv,
+                                struct v4l2_audio *a)
+{
+        a->index = 0;
+        strlcpy(a->name, "Radio", sizeof(a->name));
+        a->capability = V4L2_AUDCAP_STEREO;
         return 0;
 }
 
 static int vidioc_s_audio(struct file *file, void *priv,
                                 struct v4l2_audio *a)
 {
-        if (a->index != 0)
-                return -EINVAL;
-        return 0;
+        return a->index ? -EINVAL : 0;
 }
 
-static int trust_exclusive_open(struct file *file)
+static int trust_open(struct file *file)
 {
-        return test_and_set_bit(0, &in_use) ? -EBUSY : 0;
+        return 0;
 }
 
-static int trust_exclusive_release(struct file *file)
+static int trust_release(struct file *file)
 {
-        clear_bit(0, &in_use);
         return 0;
 }
 
 static const struct v4l2_file_operations trust_fops = {
         .owner          = THIS_MODULE,
-        .open           = trust_exclusive_open,
-        .release        = trust_exclusive_release,
+        .open           = trust_open,
+        .release        = trust_release,
         .ioctl          = video_ioctl2,
 };
 
@@ -370,59 +371,72 @@ static const struct v4l2_ioctl_ops trust_ioctl_ops = {
         .vidioc_s_input     = vidioc_s_input,
 };
 
-static struct video_device trust_radio = {
-        .name           = "Trust FM Radio",
-        .fops           = &trust_fops,
-        .ioctl_ops      = &trust_ioctl_ops,
-        .release        = video_device_release_empty,
-};
-
 static int __init trust_init(void)
 {
-        if(io == -1) {
-                printk(KERN_ERR "You must set an I/O address with io=0x???\n");
+        struct trust *tr = &trust_card;
+        struct v4l2_device *v4l2_dev = &tr->v4l2_dev;
+        int res;
+
+        strlcpy(v4l2_dev->name, "trust", sizeof(v4l2_dev->name));
+        tr->io = io;
+        tr->ioval = 0xf;
+        mutex_init(&tr->lock);
+
+        if (tr->io == -1) {
+                v4l2_err(v4l2_dev, "You must set an I/O address with io=0x???\n");
                 return -EINVAL;
         }
-        if(!request_region(io, 2, "Trust FM Radio")) {
-                printk(KERN_ERR "trust: port 0x%x already in use\n", io);
+        if (!request_region(tr->io, 2, "Trust FM Radio")) {
+                v4l2_err(v4l2_dev, "port 0x%x already in use\n", tr->io);
                 return -EBUSY;
         }
-        if (video_register_device(&trust_radio, VFL_TYPE_RADIO, radio_nr) < 0) {
-                release_region(io, 2);
+
+        res = v4l2_device_register(NULL, v4l2_dev);
+        if (res < 0) {
+                release_region(tr->io, 2);
+                v4l2_err(v4l2_dev, "Could not register v4l2_device\n");
+                return res;
+        }
+
+        strlcpy(tr->vdev.name, v4l2_dev->name, sizeof(tr->vdev.name));
+        tr->vdev.v4l2_dev = v4l2_dev;
+        tr->vdev.fops = &trust_fops;
+        tr->vdev.ioctl_ops = &trust_ioctl_ops;
+        tr->vdev.release = video_device_release_empty;
+        video_set_drvdata(&tr->vdev, tr);
+
+        if (video_register_device(&tr->vdev, VFL_TYPE_RADIO, radio_nr) < 0) {
+                v4l2_device_unregister(v4l2_dev);
+                release_region(tr->io, 2);
                 return -EINVAL;
         }
 
-        printk(KERN_INFO "Trust FM Radio card driver v1.0.\n");
+        v4l2_info(v4l2_dev, "Trust FM Radio card driver v1.0.\n");
 
-        write_i2c(2, TDA7318_ADDR, 0x80);       /* speaker att. LF = 0 dB */
-        write_i2c(2, TDA7318_ADDR, 0xa0);       /* speaker att. RF = 0 dB */
-        write_i2c(2, TDA7318_ADDR, 0xc0);       /* speaker att. LR = 0 dB */
-        write_i2c(2, TDA7318_ADDR, 0xe0);       /* speaker att. RR = 0 dB */
-        write_i2c(2, TDA7318_ADDR, 0x40);       /* stereo 1 input, gain = 18.75 dB */
+        write_i2c(tr, 2, TDA7318_ADDR, 0x80);   /* speaker att. LF = 0 dB */
+        write_i2c(tr, 2, TDA7318_ADDR, 0xa0);   /* speaker att. RF = 0 dB */
+        write_i2c(tr, 2, TDA7318_ADDR, 0xc0);   /* speaker att. LR = 0 dB */
+        write_i2c(tr, 2, TDA7318_ADDR, 0xe0);   /* speaker att. RR = 0 dB */
+        write_i2c(tr, 2, TDA7318_ADDR, 0x40);   /* stereo 1 input, gain = 18.75 dB */
 
-        tr_setvol(0x8000);
-        tr_setbass(0x8000);
-        tr_settreble(0x8000);
-        tr_setstereo(1);
+        tr_setvol(tr, 0xffff);
+        tr_setbass(tr, 0x8000);
+        tr_settreble(tr, 0x8000);
+        tr_setstereo(tr, 1);
 
         /* mute card - prevents noisy bootups */
-        tr_setmute(1);
+        tr_setmute(tr, 1);
 
         return 0;
 }
 
-MODULE_AUTHOR("Eric Lammerts, Russell Kroll, Quay Lu, Donald Song, Jason Lewis, Scott McGrath, William McGrath");
-MODULE_DESCRIPTION("A driver for the Trust FM Radio card.");
-MODULE_LICENSE("GPL");
-
-module_param(io, int, 0);
-MODULE_PARM_DESC(io, "I/O address of the Trust FM Radio card (0x350 or 0x358)");
-module_param(radio_nr, int, 0);
-
 static void __exit cleanup_trust_module(void)
 {
-        video_unregister_device(&trust_radio);
-        release_region(io, 2);
+        struct trust *tr = &trust_card;
+
+        video_unregister_device(&tr->vdev);
+        v4l2_device_unregister(&tr->v4l2_dev);
+        release_region(tr->io, 2);
 }
 
 module_init(trust_init);