This patches convert maestro radio driver to 2.6 pci API.
Generated in 2.6.15-rc5-mm3 kernel version.
01-pci-probing-for-maestro-radio.patch
02-maestro-radio-lindent.patch
03-maestro-types-change.patch
04-maestro-avoid-accessing-private-structures-directly.patch
Maestro avoid accessing private structures directly
video_device.priv is not allowed to touch and it will be actually removed
in near future. Use video_get_drvdata() instead.
Signed-off-by: Jiri Slaby <[email protected]>
---
commit 7f0d24a69ec1df36ce01b8969217fa108fe2e92f
tree daefeb7b65d6b1a9794b57bea5b34ac39bbced21
parent a6bf47a35d16fad6207effb37532466c57d20b28
author <ku@bellona.(none)> Sat, 31 Dec 2005 17:04:14 +0100
committer <ku@bellona.(none)> Sat, 31 Dec 2005 17:04:14 +0100
drivers/media/radio/radio-maestro.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -182,7 +182,7 @@ static inline int radio_function(struct
unsigned int cmd, void *arg)
{
struct video_device *dev = video_devdata(file);
- struct radio_device *card = dev->priv;
+ struct radio_device *card = video_get_drvdata(dev);
switch (cmd) {
case VIDIOCGCAP: {
@@ -258,7 +258,7 @@ static int radio_ioctl(struct inode *ino
unsigned int cmd, unsigned long arg)
{
struct video_device *dev = video_devdata(file);
- struct radio_device *card = dev->priv;
+ struct radio_device *card = video_get_drvdata(dev);
int ret;
down(&card->lock);
Pci probing for maestro radio
Pci probing functions added, some functions were rewrited.
Use PCI_DEVICE macro.
dev_* used for printing when pci_dev available.
some static variables changed to dynamicto allow operation with multiple
cards.
Deleted macros for DEVICE_IDS, they are in pci_ids.h yet.
Signed-off-by: Jiri Slaby <[email protected]>
---
commit 91d2ae25f82de5c70a8051cf579bf28d46d6bd59
tree a4501a344df183a6b851bbe223f4d40cc3400f38
parent 035d4d0665e725eb326dc3f5b6e96a53b5c559e3
author <ku@bellona.(none)> Sat, 31 Dec 2005 16:54:57 +0100
committer <ku@bellona.(none)> Sat, 31 Dec 2005 16:54:57 +0100
drivers/media/radio/radio-maestro.c | 173 ++++++++++++++++++++++-------------
1 files changed, 109 insertions(+), 64 deletions(-)
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -27,11 +27,7 @@
#include <linux/pci.h>
#include <linux/videodev.h>
-#define DRIVER_VERSION "0.04"
-
-#define PCI_VENDOR_ESS 0x125D
-#define PCI_DEVICE_ID_ESS_ESS1968 0x1968 /* Maestro 2 */
-#define PCI_DEVICE_ID_ESS_ESS1978 0x1978 /* Maestro 2E */
+#define DRIVER_VERSION "0.05"
#define GPIO_DATA 0x60 /* port offset from ESS_IO_BASE */
@@ -66,6 +62,26 @@ module_param(radio_nr, int, 0);
static int radio_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg);
+static int maestro_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
+static void maestro_remove(struct pci_dev *pdev);
+
+static struct pci_device_id maestro_r_pci_tbl[] = {
+ { PCI_DEVICE(PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ESS1968),
+ .class = PCI_CLASS_MULTIMEDIA_AUDIO << 8,
+ .class_mask = 0xffff00 },
+ { PCI_DEVICE(PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ESS1978),
+ .class = PCI_CLASS_MULTIMEDIA_AUDIO << 8,
+ .class_mask = 0xffff00 },
+ { 0 }
+};
+MODULE_DEVICE_TABLE(pci, maestro_r_pci_tbl);
+
+static struct pci_driver maestro_r_driver = {
+ .name = "maestro_radio",
+ .id_table = maestro_r_pci_tbl,
+ .probe = maestro_probe,
+ .remove = __devexit_p(maestro_remove),
+};
static struct file_operations maestro_fops = {
.owner = THIS_MODULE,
@@ -85,14 +101,14 @@ static struct video_device maestro_radio
.fops = &maestro_fops,
};
-static struct radio_device
+struct radio_device
{
__u16 io, /* base of Maestro card radio io (GPIO_DATA)*/
muted, /* VIDEO_AUDIO_MUTE */
stereo, /* VIDEO_TUNER_STEREO_ON */
tuned; /* signal strength (0 or 0xffff) */
struct semaphore lock;
-} radio_unit = {0, 0, 0, 0, };
+};
static __u32 radio_bits_get(struct radio_device *dev)
{
@@ -251,40 +267,7 @@ static int radio_ioctl(struct inode *ino
return ret;
}
-static __u16 radio_install(struct pci_dev *pcidev);
-
-MODULE_AUTHOR("Adam Tlalka, [email protected]");
-MODULE_DESCRIPTION("Radio driver for the Maestro PCI sound card radio.");
-MODULE_LICENSE("GPL");
-
-static void __exit maestro_radio_exit(void)
-{
- video_unregister_device(&maestro_radio);
-}
-
-static int __init maestro_radio_init(void)
-{
- register __u16 found=0;
- struct pci_dev *pcidev = NULL;
- while(!found && (pcidev = pci_find_device(PCI_VENDOR_ESS,
- PCI_DEVICE_ID_ESS_ESS1968,
- pcidev)))
- found |= radio_install(pcidev);
- while(!found && (pcidev = pci_find_device(PCI_VENDOR_ESS,
- PCI_DEVICE_ID_ESS_ESS1978,
- pcidev)))
- found |= radio_install(pcidev);
- if(!found) {
- printk(KERN_INFO "radio-maestro: no devices found.\n");
- return -ENODEV;
- }
- return 0;
-}
-
-module_init(maestro_radio_init);
-module_exit(maestro_radio_exit);
-
-static inline __u16 radio_power_on(struct radio_device *dev)
+static __u16 __devinit radio_power_on(struct radio_device *dev)
{
register __u16 io=dev->io;
register __u32 ofreq;
@@ -305,29 +288,91 @@ static inline __u16 radio_power_on(struc
return (ofreq == radio_bits_get(dev));
}
-static __u16 radio_install(struct pci_dev *pcidev)
+static int __devinit maestro_probe(struct pci_dev *pdev,
+ const struct pci_device_id *ent)
{
- if(((pcidev->class >> 8) & 0xffff) != PCI_CLASS_MULTIMEDIA_AUDIO)
- return 0;
-
- radio_unit.io = pcidev->resource[0].start + GPIO_DATA;
- maestro_radio.priv = &radio_unit;
- init_MUTEX(&radio_unit.lock);
-
- if(radio_power_on(&radio_unit)) {
- if(video_register_device(&maestro_radio, VFL_TYPE_RADIO, radio_nr)==-1) {
- printk("radio-maestro: can't register device!");
- return 0;
- }
- printk(KERN_INFO "radio-maestro: version "
- DRIVER_VERSION
- " time "
- __TIME__ " "
- __DATE__
- "\n");
- printk(KERN_INFO "radio-maestro: radio chip initialized\n");
- return 1;
- } else
- return 0;
+ struct radio_device *radio_unit;
+ struct video_device *maestro_radio_inst;
+ int retval;
+
+ retval = pci_enable_device(pdev);
+ if (retval) {
+ dev_err(&pdev->dev, "enabling pci device failed!\n");
+ goto err;
+ }
+
+ retval = -ENOMEM;
+
+ radio_unit = kzalloc(sizeof(*radio_unit), GFP_KERNEL);
+ if (radio_unit == NULL) {
+ dev_err(&pdev->dev, "not enough memory\n");
+ goto err;
+ }
+
+ radio_unit->io = pci_resource_start(pdev, 0) + GPIO_DATA;
+ init_MUTEX(&radio_unit->lock);
+
+ maestro_radio_inst = video_device_alloc();
+ if (maestro_radio_inst == NULL) {
+ dev_err(&pdev->dev, "not enough memory\n");
+ goto errfr;
+ }
+
+ memcpy(maestro_radio_inst, &maestro_radio, sizeof(maestro_radio));
+ video_set_drvdata(maestro_radio_inst, radio_unit);
+ pci_set_drvdata(pdev, maestro_radio_inst);
+
+ retval = video_register_device(maestro_radio_inst, VFL_TYPE_RADIO,
+ radio_nr);
+ if (retval) {
+ printk(KERN_ERR "can't register video device!\n");
+ goto errfr1;
+ }
+
+ if (!radio_power_on(radio_unit)) {
+ retval = -EIO;
+ goto errfr1;
+ }
+
+ dev_info(&pdev->dev, "version " DRIVER_VERSION " time " __TIME__ " "
+ __DATE__ "\n");
+ dev_info(&pdev->dev, "radio chip initialized\n");
+
+ return 0;
+errfr1:
+ kfree(maestro_radio_inst);
+errfr:
+ kfree(radio_unit);
+err:
+ return retval;
+
+}
+
+static void __devexit maestro_remove(struct pci_dev *pdev)
+{
+ struct video_device *vdev = pci_get_drvdata(pdev);
+
+ video_unregister_device(vdev);
}
+MODULE_AUTHOR("Adam Tlalka, [email protected]");
+MODULE_DESCRIPTION("Radio driver for the Maestro PCI sound card radio.");
+MODULE_LICENSE("GPL");
+
+static int __init maestro_radio_init(void)
+{
+ int retval = pci_register_driver(&maestro_r_driver);
+
+ if (retval)
+ printk(KERN_ERR "error during registration pci driver\n");
+
+ return retval;
+}
+
+static void __exit maestro_radio_exit(void)
+{
+ pci_unregister_driver(&maestro_r_driver);
+}
+
+module_init(maestro_radio_init);
+module_exit(maestro_radio_exit);
Maestro types change
[depends on Maestro Lindent]
__u16 --> u16 and so on
Signed-off-by: Jiri Slaby <[email protected]>
---
commit a6bf47a35d16fad6207effb37532466c57d20b28
tree 52defb3f608ab7309dac7fd63717f3f811bc98b3
parent f3f0d3e94b346e181a62de564506db1be00bb8ef
author <ku@bellona.(none)> Sat, 31 Dec 2005 17:01:25 +0100
committer <ku@bellona.(none)> Sat, 31 Dec 2005 17:01:25 +0100
drivers/media/radio/radio-maestro.c | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -103,18 +103,18 @@ static struct video_device maestro_radio
struct radio_device
{
- __u16 io, /* base of Maestro card radio io (GPIO_DATA)*/
+ u16 io, /* base of Maestro card radio io (GPIO_DATA)*/
muted, /* VIDEO_AUDIO_MUTE */
stereo, /* VIDEO_TUNER_STEREO_ON */
tuned; /* signal strength (0 or 0xffff) */
struct semaphore lock;
};
-static __u32 radio_bits_get(struct radio_device *dev)
+static u32 radio_bits_get(struct radio_device *dev)
{
- register __u16 io=dev->io, l, rdata;
- register __u32 data=0;
- __u16 omask;
+ register u16 io=dev->io, l, rdata;
+ register u32 data=0;
+ u16 omask;
omask = inw(io + IO_MASK);
outw(~(STR_CLK | STR_WREN), io + IO_MASK);
@@ -148,10 +148,10 @@ static __u32 radio_bits_get(struct radio
return data & 0x3ffe;
}
-static void radio_bits_set(struct radio_device *dev, __u32 data)
+static void radio_bits_set(struct radio_device *dev, u32 data)
{
- register __u16 io=dev->io, l, bits;
- __u16 omask, odir;
+ register u16 io=dev->io, l, bits;
+ u16 omask, odir;
omask = inw(io + IO_MASK);
odir = (inw(io + IO_DIR) & ~STR_DATA) | (STR_CLK | STR_WREN);
@@ -231,8 +231,8 @@ static inline int radio_function(struct
if (v->audio)
return -EINVAL;
{
- register __u16 io = card->io;
- register __u16 omask = inw(io + IO_MASK);
+ register u16 io = card->io;
+ register u16 omask = inw(io + IO_MASK);
outw(~STR_WREN, io + IO_MASK);
outw((card->muted = v->flags & VIDEO_AUDIO_MUTE) ?
STR_WREN : 0, io);
@@ -268,11 +268,11 @@ static int radio_ioctl(struct inode *ino
return ret;
}
-static __u16 __devinit radio_power_on(struct radio_device *dev)
+static u16 __devinit radio_power_on(struct radio_device *dev)
{
- register __u16 io = dev->io;
- register __u32 ofreq;
- __u16 omask, odir;
+ register u16 io = dev->io;
+ register u32 ofreq;
+ u16 omask, odir;
omask = inw(io + IO_MASK);
odir = (inw(io + IO_DIR) & ~STR_DATA) | (STR_CLK | STR_WREN);
Maestro radio Lindent
[depends on mastro radio pci probing]
+some handwork
Signed-off-by: Jiri Slaby <[email protected]>
---
commit f3f0d3e94b346e181a62de564506db1be00bb8ef
tree e52683bd644912b08905c2ce1dd719c9dea5b758
parent 91d2ae25f82de5c70a8051cf579bf28d46d6bd59
author <ku@bellona.(none)> Sat, 31 Dec 2005 17:00:05 +0100
committer <ku@bellona.(none)> Sat, 31 Dec 2005 17:00:05 +0100
drivers/media/radio/radio-maestro.c | 210 ++++++++++++++++++-----------------
1 files changed, 107 insertions(+), 103 deletions(-)
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -29,28 +29,28 @@
#define DRIVER_VERSION "0.05"
-#define GPIO_DATA 0x60 /* port offset from ESS_IO_BASE */
+#define GPIO_DATA 0x60 /* port offset from ESS_IO_BASE */
#define IO_MASK 4 /* mask register offset from GPIO_DATA
bits 1=unmask write to given bit */
#define IO_DIR 8 /* direction register offset from GPIO_DATA
bits 0/1=read/write direction */
-#define GPIO6 0x0040 /* mask bits for GPIO lines */
-#define GPIO7 0x0080
-#define GPIO8 0x0100
-#define GPIO9 0x0200
-
-#define STR_DATA GPIO6 /* radio TEA5757 pins and GPIO bits */
-#define STR_CLK GPIO7
-#define STR_WREN GPIO8
-#define STR_MOST GPIO9
+#define GPIO6 0x0040 /* mask bits for GPIO lines */
+#define GPIO7 0x0080
+#define GPIO8 0x0100
+#define GPIO9 0x0200
+
+#define STR_DATA GPIO6 /* radio TEA5757 pins and GPIO bits */
+#define STR_CLK GPIO7
+#define STR_WREN GPIO8
+#define STR_MOST GPIO9
#define FREQ_LO 50*16000
#define FREQ_HI 150*16000
-#define FREQ_IF 171200 /* 10.7*16000 */
-#define FREQ_STEP 200 /* 12.5*16 */
+#define FREQ_IF 171200 /* 10.7*16000 */
+#define FREQ_STEP 200 /* 12.5*16 */
#define FREQ2BITS(x) ((((unsigned int)(x)+FREQ_IF+(FREQ_STEP<<1))\
/(FREQ_STEP<<2))<<2) /* (x==fmhz*16*1000) -> bits */
@@ -61,7 +61,7 @@ static int radio_nr = -1;
module_param(radio_nr, int, 0);
static int radio_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg);
+ unsigned int cmd, unsigned long arg);
static int maestro_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
static void maestro_remove(struct pci_dev *pdev);
@@ -85,11 +85,11 @@ static struct pci_driver maestro_r_drive
static struct file_operations maestro_fops = {
.owner = THIS_MODULE,
- .open = video_exclusive_open,
- .release = video_exclusive_release,
+ .open = video_exclusive_open,
+ .release = video_exclusive_release,
.ioctl = radio_ioctl,
.compat_ioctl = v4l_compat_ioctl32,
- .llseek = no_llseek,
+ .llseek = no_llseek,
};
static struct video_device maestro_radio=
@@ -98,7 +98,7 @@ static struct video_device maestro_radio
.name = "Maestro radio",
.type = VID_TYPE_TUNER,
.hardware = VID_HARDWARE_SF16MI,
- .fops = &maestro_fops,
+ .fops = &maestro_fops,
};
struct radio_device
@@ -107,7 +107,7 @@ struct radio_device
muted, /* VIDEO_AUDIO_MUTE */
stereo, /* VIDEO_TUNER_STEREO_ON */
tuned; /* signal strength (0 or 0xffff) */
- struct semaphore lock;
+ struct semaphore lock;
};
static __u32 radio_bits_get(struct radio_device *dev)
@@ -115,6 +115,7 @@ static __u32 radio_bits_get(struct radio
register __u16 io=dev->io, l, rdata;
register __u32 data=0;
__u16 omask;
+
omask = inw(io + IO_MASK);
outw(~(STR_CLK | STR_WREN), io + IO_MASK);
outw(0, io);
@@ -137,10 +138,13 @@ static __u32 radio_bits_get(struct radio
data++;
udelay(2);
}
+
if(dev->muted)
outw(STR_WREN, io);
+
udelay(4);
outw(omask, io + IO_MASK);
+
return data & 0x3ffe;
}
@@ -148,6 +152,7 @@ static void radio_bits_set(struct radio_
{
register __u16 io=dev->io, l, bits;
__u16 omask, odir;
+
omask = inw(io + IO_MASK);
odir = (inw(io + IO_DIR) & ~STR_DATA) | (STR_CLK | STR_WREN);
outw(odir | STR_DATA, io + IO_DIR);
@@ -163,8 +168,10 @@ static void radio_bits_set(struct radio_
outw(bits, io); /* LO level */
udelay(4);
}
+
if(!dev->muted)
outw(0, io);
+
udelay(4);
outw(omask, io + IO_MASK);
outw(odir, io + IO_DIR);
@@ -172,108 +179,103 @@ static void radio_bits_set(struct radio_
}
static inline int radio_function(struct inode *inode, struct file *file,
- unsigned int cmd, void *arg)
+ unsigned int cmd, void *arg)
{
struct video_device *dev = video_devdata(file);
- struct radio_device *card=dev->priv;
-
- switch(cmd) {
- case VIDIOCGCAP: {
- struct video_capability *v = arg;
- memset(v,0,sizeof(*v));
- strcpy(v->name, "Maestro radio");
- v->type=VID_TYPE_TUNER;
- v->channels=v->audios=1;
- return 0;
- }
- case VIDIOCGTUNER: {
- struct video_tuner *v = arg;
- if(v->tuner)
- return -EINVAL;
- (void)radio_bits_get(card);
- v->flags = VIDEO_TUNER_LOW | card->stereo;
- v->signal = card->tuned;
- strcpy(v->name, "FM");
- v->rangelow = FREQ_LO;
- v->rangehigh = FREQ_HI;
- v->mode = VIDEO_MODE_AUTO;
- return 0;
- }
- case VIDIOCSTUNER: {
- struct video_tuner *v = arg;
- if(v->tuner!=0)
- return -EINVAL;
- return 0;
- }
- case VIDIOCGFREQ: {
- unsigned long *freq = arg;
- *freq = BITS2FREQ(radio_bits_get(card));
- return 0;
- }
- case VIDIOCSFREQ: {
- unsigned long *freq = arg;
- if (*freq<FREQ_LO || *freq>FREQ_HI )
- return -EINVAL;
- radio_bits_set(card, FREQ2BITS(*freq));
+ struct radio_device *card = dev->priv;
+
+ switch (cmd) {
+ case VIDIOCGCAP: {
+ struct video_capability *v = arg;
+ memset(v, 0, sizeof(*v));
+ strcpy(v->name, "Maestro radio");
+ v->type = VID_TYPE_TUNER;
+ v->channels = v->audios = 1;
+ return 0;
+ } case VIDIOCGTUNER: {
+ struct video_tuner *v = arg;
+ if (v->tuner)
+ return -EINVAL;
+ (void)radio_bits_get(card);
+ v->flags = VIDEO_TUNER_LOW | card->stereo;
+ v->signal = card->tuned;
+ strcpy(v->name, "FM");
+ v->rangelow = FREQ_LO;
+ v->rangehigh = FREQ_HI;
+ v->mode = VIDEO_MODE_AUTO;
+ return 0;
+ } case VIDIOCSTUNER: {
+ struct video_tuner *v = arg;
+ if (v->tuner != 0)
+ return -EINVAL;
+ return 0;
+ } case VIDIOCGFREQ: {
+ unsigned long *freq = arg;
+ *freq = BITS2FREQ(radio_bits_get(card));
+ return 0;
+ } case VIDIOCSFREQ: {
+ unsigned long *freq = arg;
+ if (*freq < FREQ_LO || *freq > FREQ_HI)
+ return -EINVAL;
+ radio_bits_set(card, FREQ2BITS(*freq));
+ return 0;
+ } case VIDIOCGAUDIO: {
+ struct video_audio *v = arg;
+ memset(v, 0, sizeof(*v));
+ strcpy(v->name, "Radio");
+ v->flags = VIDEO_AUDIO_MUTABLE | card->muted;
+ v->mode = VIDEO_SOUND_STEREO;
+ return 0;
+ } case VIDIOCSAUDIO: {
+ struct video_audio *v = arg;
+ if (v->audio)
+ return -EINVAL;
+ {
+ register __u16 io = card->io;
+ register __u16 omask = inw(io + IO_MASK);
+ outw(~STR_WREN, io + IO_MASK);
+ outw((card->muted = v->flags & VIDEO_AUDIO_MUTE) ?
+ STR_WREN : 0, io);
+ udelay(4);
+ outw(omask, io + IO_MASK);
+ msleep(125);
return 0;
}
- case VIDIOCGAUDIO: {
- struct video_audio *v = arg;
- memset(v,0,sizeof(*v));
- strcpy(v->name, "Radio");
- v->flags=VIDEO_AUDIO_MUTABLE | card->muted;
- v->mode=VIDEO_SOUND_STEREO;
- return 0;
- }
- case VIDIOCSAUDIO: {
- struct video_audio *v = arg;
- if(v->audio)
- return -EINVAL;
- {
- register __u16 io=card->io;
- register __u16 omask = inw(io + IO_MASK);
- outw(~STR_WREN, io + IO_MASK);
- outw((card->muted = v->flags & VIDEO_AUDIO_MUTE)
- ? STR_WREN : 0, io);
- udelay(4);
- outw(omask, io + IO_MASK);
- msleep(125);
- return 0;
- }
- }
- case VIDIOCGUNIT: {
- struct video_unit *v = arg;
- v->video=VIDEO_NO_UNIT;
- v->vbi=VIDEO_NO_UNIT;
- v->radio=dev->minor;
- v->audio=0;
- v->teletext=VIDEO_NO_UNIT;
- return 0;
- }
- default: return -ENOIOCTLCMD;
+ } case VIDIOCGUNIT: {
+ struct video_unit *v = arg;
+ v->video = VIDEO_NO_UNIT;
+ v->vbi = VIDEO_NO_UNIT;
+ v->radio = dev->minor;
+ v->audio = 0;
+ v->teletext = VIDEO_NO_UNIT;
+ return 0;
+ } default:
+ return -ENOIOCTLCMD;
}
}
static int radio_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg)
+ unsigned int cmd, unsigned long arg)
{
struct video_device *dev = video_devdata(file);
- struct radio_device *card=dev->priv;
+ struct radio_device *card = dev->priv;
int ret;
down(&card->lock);
ret = video_usercopy(inode, file, cmd, arg, radio_function);
up(&card->lock);
+
return ret;
}
static __u16 __devinit radio_power_on(struct radio_device *dev)
{
- register __u16 io=dev->io;
+ register __u16 io = dev->io;
register __u32 ofreq;
__u16 omask, odir;
+
omask = inw(io + IO_MASK);
- odir = (inw(io + IO_DIR) & ~STR_DATA) | (STR_CLK | STR_WREN);
+ odir = (inw(io + IO_DIR) & ~STR_DATA) | (STR_CLK | STR_WREN);
outw(odir & ~STR_WREN, io + IO_DIR);
dev->muted = inw(io) & STR_WREN ? 0 : VIDEO_AUDIO_MUTE;
outw(odir, io + IO_DIR);
@@ -282,9 +284,11 @@ static __u16 __devinit radio_power_on(st
udelay(16);
outw(omask, io + IO_MASK);
ofreq = radio_bits_get(dev);
- if((ofreq<FREQ2BITS(FREQ_LO)) || (ofreq>FREQ2BITS(FREQ_HI)))
+
+ if ((ofreq < FREQ2BITS(FREQ_LO)) || (ofreq > FREQ2BITS(FREQ_HI)))
ofreq = FREQ2BITS(FREQ_LO);
radio_bits_set(dev, ofreq);
+
return (ofreq == radio_bits_get(dev));
}
@@ -335,7 +339,7 @@ static int __devinit maestro_probe(struc
}
dev_info(&pdev->dev, "version " DRIVER_VERSION " time " __TIME__ " "
- __DATE__ "\n");
+ __DATE__ "\n");
dev_info(&pdev->dev, "radio chip initialized\n");
return 0;
@@ -355,10 +359,6 @@ static void __devexit maestro_remove(str
video_unregister_device(vdev);
}
-MODULE_AUTHOR("Adam Tlalka, [email protected]");
-MODULE_DESCRIPTION("Radio driver for the Maestro PCI sound card radio.");
-MODULE_LICENSE("GPL");
-
static int __init maestro_radio_init(void)
{
int retval = pci_register_driver(&maestro_r_driver);
@@ -376,3 +376,7 @@ static void __exit maestro_radio_exit(vo
module_init(maestro_radio_init);
module_exit(maestro_radio_exit);
+
+MODULE_AUTHOR("Adam Tlalka, [email protected]");
+MODULE_DESCRIPTION("Radio driver for the Maestro PCI sound card radio.");
+MODULE_LICENSE("GPL");
Maestro radio delete owner line from video device
fops is used for module handling with ownership.
Signed-off-by: Jiri Slaby <[email protected]>
---
radio-maestro.c | 4 +---
1 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -92,9 +92,7 @@ static struct file_operations maestro_fo
.llseek = no_llseek,
};
-static struct video_device maestro_radio=
-{
- .owner = THIS_MODULE,
+static struct video_device maestro_radio = {
.name = "Maestro radio",
.type = VID_TYPE_TUNER,
.hardware = VID_HARDWARE_SF16MI,
[video_device_owner patch added]
This patches convert maestro radio driver to 2.6 pci API.
Generated in 2.6.15-rc5-mm3 kernel version.
01-pci-probing-for-maestro-radio.patch
02-maestro-radio-lindent.patch
03-maestro-types-change.patch
04-maestro-avoid-accessing-private-structures-directly.patch
05-video_device_owner.patch
"Jiri Slaby" <[email protected]> wrote:
>
> + retval = video_register_device(maestro_radio_inst, VFL_TYPE_RADIO,
> + radio_nr);
> + if (retval) {
> + printk(KERN_ERR "can't register video device!\n");
> + goto errfr1;
> + }
> +
> + if (!radio_power_on(radio_unit)) {
> + retval = -EIO;
Shouldn't we unregister the video device here?
> + goto errfr1;
> + }
> +
> + dev_info(&pdev->dev, "version " DRIVER_VERSION " time " __TIME__ " "
> + __DATE__ "\n");
> + dev_info(&pdev->dev, "radio chip initialized\n");
> +
> + return 0;
> +errfr1:
> + kfree(maestro_radio_inst);
> +errfr:
> + kfree(radio_unit);
> +err:
> + return retval;
> +
Dnia 04-01-2006 o 10:45:32 Andrew Morton <[email protected]> napisa?:
> "Jiri Slaby" <[email protected]> wrote:
>>
>> + retval = video_register_device(maestro_radio_inst, VFL_TYPE_RADIO,
>> + radio_nr);
>> + if (retval) {
>> + printk(KERN_ERR "can't register video device!\n");
>> + goto errfr1;
>> + }
>> +
>> + if (!radio_power_on(radio_unit)) {
>> + retval = -EIO;
>
> Shouldn't we unregister the video device here?
Current behaviour means that device is here but not functioning properly
but
we can unregister it of course because it is useless anyway ;-).
Regards
--
Adam Tla?ka mailto:[email protected] ^v^ ^v^ ^v^
System & Network Administration Group ~~~~~~
Computer Center, Gda?sk University of Technology, Poland
PGP public key: finger [email protected]
Adam Tlalka wrote:
>Dnia 04-01-2006 o 10:45:32 Andrew Morton <[email protected]> napisal:
>
>> "Jiri Slaby" <[email protected]> wrote:
>>>
>>> + retval = video_register_device(maestro_radio_inst, VFL_TYPE_RADIO,
>>> + radio_nr);
>>> + if (retval) {
>>> + printk(KERN_ERR "can't register video device!\n");
>>> + goto errfr1;
>>> + }
>>> +
>>> + if (!radio_power_on(radio_unit)) {
>>> + retval = -EIO;
>>
>> Shouldn't we unregister the video device here?
>
>Current behaviour means that device is here but not functioning properly
>but
>we can unregister it of course because it is useless anyway ;-).
Yup, here is a patch to avoid this. Thanks. [Applicable/dependent after/on
media-radio-maestro-types-change (last patch)]
media-radio-pci-probing-for-maestro-radio-unregister-video
Unregister video device if it is registered, but driver fail still in
initialization.
--
radio-maestro.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletion(-)
--- drivers/media/radio/radio-maestro.c.old 2006-01-04 11:07:41.000000000 +0100
+++ drivers/media/radio/radio-maestro.c 2006-01-04 11:09:48.000000000 +0100
@@ -333,7 +333,7 @@ static int __devinit maestro_probe(struc
if (!radio_power_on(radio_unit)) {
retval = -EIO;
- goto errfr1;
+ goto errunr;
}
dev_info(&pdev->dev, "version " DRIVER_VERSION " time " __TIME__ " "
@@ -341,6 +341,8 @@ static int __devinit maestro_probe(struc
dev_info(&pdev->dev, "radio chip initialized\n");
return 0;
+errunr:
+ video_unregister_device(maestro_radio_inst);
errfr1:
kfree(maestro_radio_inst);
errfr: