Commit bcbcf54d authored by Art Haas's avatar Art Haas Committed by Linus Torvalds

[PATCH] C99 initializers for drivers/media/radio

parent c61843a8
...@@ -217,26 +217,25 @@ static int pcm20_ioctl(struct inode *inode, struct file *file, ...@@ -217,26 +217,25 @@ static int pcm20_ioctl(struct inode *inode, struct file *file,
} }
static struct pcm20_device pcm20_unit = { static struct pcm20_device pcm20_unit = {
freq: 87*16000, .freq = 87*16000,
muted: 1, .muted = 1,
stereo: 0
}; };
static struct file_operations pcm20_fops = { static struct file_operations pcm20_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
open: video_exclusive_open, .open = video_exclusive_open,
release: video_exclusive_release, .release = video_exclusive_release,
ioctl: pcm20_ioctl, .ioctl = pcm20_ioctl,
llseek: no_llseek, .llseek = no_llseek,
}; };
static struct video_device pcm20_radio = { static struct video_device pcm20_radio = {
owner: THIS_MODULE, .owner = THIS_MODULE,
name: "Miro PCM 20 radio", .name = "Miro PCM 20 radio",
type: VID_TYPE_TUNER, .type = VID_TYPE_TUNER,
hardware: VID_HARDWARE_RTRACK, .hardware = VID_HARDWARE_RTRACK,
fops: &pcm20_fops, .fops = &pcm20_fops,
priv: &pcm20_unit .priv = &pcm20_unit
}; };
static int __init pcm20_init(void) static int __init pcm20_init(void)
......
...@@ -105,10 +105,10 @@ static ssize_t rds_f_read(struct file *file, char *buffer, size_t length, loff_t ...@@ -105,10 +105,10 @@ static ssize_t rds_f_read(struct file *file, char *buffer, size_t length, loff_t
} }
static struct file_operations rds_f_ops = { static struct file_operations rds_f_ops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
read: rds_f_read, .read = rds_f_read,
open: rds_f_open, .open = rds_f_open,
release: rds_f_release .release = rds_f_release
}; };
......
...@@ -300,20 +300,20 @@ static int rt_ioctl(struct inode *inode, struct file *file, ...@@ -300,20 +300,20 @@ static int rt_ioctl(struct inode *inode, struct file *file,
static struct rt_device rtrack_unit; static struct rt_device rtrack_unit;
static struct file_operations rtrack_fops = { static struct file_operations rtrack_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
open: video_exclusive_open, .open = video_exclusive_open,
release: video_exclusive_release, .release = video_exclusive_release,
ioctl: rt_ioctl, .ioctl = rt_ioctl,
llseek: no_llseek, .llseek = no_llseek,
}; };
static struct video_device rtrack_radio= static struct video_device rtrack_radio=
{ {
owner: THIS_MODULE, .owner = THIS_MODULE,
name: "RadioTrack radio", .name = "RadioTrack radio",
type: VID_TYPE_TUNER, .type = VID_TYPE_TUNER,
hardware: VID_HARDWARE_RTRACK, .hardware = VID_HARDWARE_RTRACK,
fops: &rtrack_fops, .fops = &rtrack_fops,
}; };
static int __init rtrack_init(void) static int __init rtrack_init(void)
......
...@@ -252,20 +252,20 @@ static int az_ioctl(struct inode *inode, struct file *file, ...@@ -252,20 +252,20 @@ static int az_ioctl(struct inode *inode, struct file *file,
static struct az_device aztech_unit; static struct az_device aztech_unit;
static struct file_operations aztech_fops = { static struct file_operations aztech_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
open: video_exclusive_open, .open = video_exclusive_open,
release: video_exclusive_release, .release = video_exclusive_release,
ioctl: az_ioctl, .ioctl = az_ioctl,
llseek: no_llseek, .llseek = no_llseek,
}; };
static struct video_device aztech_radio= static struct video_device aztech_radio=
{ {
owner: THIS_MODULE, .owner = THIS_MODULE,
name: "Aztech radio", .name = "Aztech radio",
type: VID_TYPE_TUNER, .type = VID_TYPE_TUNER,
hardware: VID_HARDWARE_AZTECH, .hardware = VID_HARDWARE_AZTECH,
fops: &aztech_fops, .fops = &aztech_fops,
}; };
static int __init aztech_init(void) static int __init aztech_init(void)
......
...@@ -524,21 +524,21 @@ static int cadet_release(struct inode *inode, struct file *file) ...@@ -524,21 +524,21 @@ static int cadet_release(struct inode *inode, struct file *file)
static struct file_operations cadet_fops = { static struct file_operations cadet_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
open: cadet_open, .open = cadet_open,
release: cadet_release, .release = cadet_release,
read: cadet_read, .read = cadet_read,
ioctl: cadet_ioctl, .ioctl = cadet_ioctl,
llseek: no_llseek, .llseek = no_llseek,
}; };
static struct video_device cadet_radio= static struct video_device cadet_radio=
{ {
owner: THIS_MODULE, .owner = THIS_MODULE,
name: "Cadet radio", .name = "Cadet radio",
type: VID_TYPE_TUNER, .type = VID_TYPE_TUNER,
hardware: VID_HARDWARE_CADET, .hardware = VID_HARDWARE_CADET,
fops: &cadet_fops, .fops = &cadet_fops,
}; };
static int isapnp_cadet_probe(void) static int isapnp_cadet_probe(void)
......
...@@ -298,19 +298,19 @@ MODULE_DEVICE_TABLE( pci, gemtek_pci_id ); ...@@ -298,19 +298,19 @@ MODULE_DEVICE_TABLE( pci, gemtek_pci_id );
static u8 mx = 1; static u8 mx = 1;
static struct file_operations gemtek_pci_fops = { static struct file_operations gemtek_pci_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
open: video_exclusive_open, .open = video_exclusive_open,
release: video_exclusive_release, .release = video_exclusive_release,
ioctl: gemtek_pci_ioctl, .ioctl = gemtek_pci_ioctl,
llseek: no_llseek, .llseek = no_llseek,
}; };
static struct video_device vdev_template = { static struct video_device vdev_template = {
owner: THIS_MODULE, .owner = THIS_MODULE,
name: "Gemtek PCI Radio", .name = "Gemtek PCI Radio",
type: VID_TYPE_TUNER, .type = VID_TYPE_TUNER,
hardware: VID_HARDWARE_GEMTEK, .hardware = VID_HARDWARE_GEMTEK,
fops: &gemtek_pci_fops, .fops = &gemtek_pci_fops,
}; };
static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci_device_id *pci_id ) static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci_device_id *pci_id )
...@@ -387,10 +387,10 @@ static void __devexit gemtek_pci_remove( struct pci_dev *pci_dev ) ...@@ -387,10 +387,10 @@ static void __devexit gemtek_pci_remove( struct pci_dev *pci_dev )
static struct pci_driver gemtek_pci_driver = static struct pci_driver gemtek_pci_driver =
{ {
name: "gemtek_pci", .name = "gemtek_pci",
id_table: gemtek_pci_id, .id_table = gemtek_pci_id,
probe: gemtek_pci_probe, .probe = gemtek_pci_probe,
remove: __devexit_p(gemtek_pci_remove), .remove = __devexit_p(gemtek_pci_remove),
}; };
static int __init gemtek_pci_init_module( void ) static int __init gemtek_pci_init_module( void )
......
...@@ -229,20 +229,20 @@ static int gemtek_ioctl(struct inode *inode, struct file *file, ...@@ -229,20 +229,20 @@ static int gemtek_ioctl(struct inode *inode, struct file *file,
static struct gemtek_device gemtek_unit; static struct gemtek_device gemtek_unit;
static struct file_operations gemtek_fops = { static struct file_operations gemtek_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
open: video_exclusive_open, .open = video_exclusive_open,
release: video_exclusive_release, .release = video_exclusive_release,
ioctl: gemtek_ioctl, .ioctl = gemtek_ioctl,
llseek: no_llseek, .llseek = no_llseek,
}; };
static struct video_device gemtek_radio= static struct video_device gemtek_radio=
{ {
owner: THIS_MODULE, .owner = THIS_MODULE,
name: "GemTek radio", .name = "GemTek radio",
type: VID_TYPE_TUNER, .type = VID_TYPE_TUNER,
hardware: VID_HARDWARE_GEMTEK, .hardware = VID_HARDWARE_GEMTEK,
fops: &gemtek_fops, .fops = &gemtek_fops,
}; };
static int __init gemtek_init(void) static int __init gemtek_init(void)
......
...@@ -68,20 +68,20 @@ static int radio_ioctl(struct inode *inode, struct file *file, ...@@ -68,20 +68,20 @@ static int radio_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg); unsigned int cmd, unsigned long arg);
static struct file_operations maestro_fops = { static struct file_operations maestro_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
open: video_exclusive_open, .open = video_exclusive_open,
release: video_exclusive_release, .release = video_exclusive_release,
ioctl: radio_ioctl, .ioctl = radio_ioctl,
llseek: no_llseek, .llseek = no_llseek,
}; };
static struct video_device maestro_radio= static struct video_device maestro_radio=
{ {
owner: THIS_MODULE, .owner = THIS_MODULE,
name: "Maestro radio", .name = "Maestro radio",
type: VID_TYPE_TUNER, .type = VID_TYPE_TUNER,
hardware: VID_HARDWARE_SF16MI, .hardware = VID_HARDWARE_SF16MI,
fops: &maestro_fops, .fops = &maestro_fops,
}; };
static struct radio_device static struct radio_device
......
...@@ -76,19 +76,19 @@ static int radio_ioctl(struct inode *inode, struct file *file, ...@@ -76,19 +76,19 @@ static int radio_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg); unsigned int cmd, unsigned long arg);
static struct file_operations maxiradio_fops = { static struct file_operations maxiradio_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
open: video_exclusive_open, .open = video_exclusive_open,
release: video_exclusive_release, .release = video_exclusive_release,
ioctl: radio_ioctl, .ioctl = radio_ioctl,
llseek: no_llseek, .llseek = no_llseek,
}; };
static struct video_device maxiradio_radio = static struct video_device maxiradio_radio =
{ {
owner: THIS_MODULE, .owner = THIS_MODULE,
name: "Maxi Radio FM2000 radio", .name = "Maxi Radio FM2000 radio",
type: VID_TYPE_TUNER, .type = VID_TYPE_TUNER,
hardware: VID_HARDWARE_SF16MI, .hardware = VID_HARDWARE_SF16MI,
fops: &maxiradio_fops, .fops = &maxiradio_fops,
}; };
static struct radio_device static struct radio_device
...@@ -336,10 +336,10 @@ static struct pci_device_id maxiradio_pci_tbl[] __devinitdata = { ...@@ -336,10 +336,10 @@ static struct pci_device_id maxiradio_pci_tbl[] __devinitdata = {
MODULE_DEVICE_TABLE(pci, maxiradio_pci_tbl); MODULE_DEVICE_TABLE(pci, maxiradio_pci_tbl);
static struct pci_driver maxiradio_driver = { static struct pci_driver maxiradio_driver = {
name: "radio-maxiradio", .name = "radio-maxiradio",
id_table: maxiradio_pci_tbl, .id_table = maxiradio_pci_tbl,
probe: maxiradio_init_one, .probe = maxiradio_init_one,
remove: __devexit_p(maxiradio_remove_one), .remove = __devexit_p(maxiradio_remove_one),
}; };
int __init maxiradio_radio_init(void) int __init maxiradio_radio_init(void)
......
...@@ -195,20 +195,20 @@ static int rt_ioctl(struct inode *inode, struct file *file, ...@@ -195,20 +195,20 @@ static int rt_ioctl(struct inode *inode, struct file *file,
static struct rt_device rtrack2_unit; static struct rt_device rtrack2_unit;
static struct file_operations rtrack2_fops = { static struct file_operations rtrack2_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
open: video_exclusive_open, .open = video_exclusive_open,
release: video_exclusive_release, .release = video_exclusive_release,
ioctl: rt_ioctl, .ioctl = rt_ioctl,
llseek: no_llseek, .llseek = no_llseek,
}; };
static struct video_device rtrack2_radio= static struct video_device rtrack2_radio=
{ {
owner: THIS_MODULE, .owner = THIS_MODULE,
name: "RadioTrack II radio", .name = "RadioTrack II radio",
type: VID_TYPE_TUNER, .type = VID_TYPE_TUNER,
hardware: VID_HARDWARE_RTRACK2, .hardware = VID_HARDWARE_RTRACK2,
fops: &rtrack2_fops, .fops = &rtrack2_fops,
}; };
static int __init rtrack2_init(void) static int __init rtrack2_init(void)
......
...@@ -223,20 +223,20 @@ static int fmi_ioctl(struct inode *inode, struct file *file, ...@@ -223,20 +223,20 @@ static int fmi_ioctl(struct inode *inode, struct file *file,
static struct fmi_device fmi_unit; static struct fmi_device fmi_unit;
static struct file_operations fmi_fops = { static struct file_operations fmi_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
open: video_exclusive_open, .open = video_exclusive_open,
release: video_exclusive_release, .release = video_exclusive_release,
ioctl: fmi_ioctl, .ioctl = fmi_ioctl,
llseek: no_llseek, .llseek = no_llseek,
}; };
static struct video_device fmi_radio= static struct video_device fmi_radio=
{ {
owner: THIS_MODULE, .owner = THIS_MODULE,
name: "SF16FMx radio", .name = "SF16FMx radio",
type: VID_TYPE_TUNER, .type = VID_TYPE_TUNER,
hardware: VID_HARDWARE_SF16MI, .hardware = VID_HARDWARE_SF16MI,
fops: &fmi_fops, .fops = &fmi_fops,
}; };
/* ladis: this is my card. does any other types exist? */ /* ladis: this is my card. does any other types exist? */
......
...@@ -272,20 +272,20 @@ static int tt_ioctl(struct inode *inode, struct file *file, ...@@ -272,20 +272,20 @@ static int tt_ioctl(struct inode *inode, struct file *file,
static struct tt_device terratec_unit; static struct tt_device terratec_unit;
static struct file_operations terratec_fops = { static struct file_operations terratec_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
open: video_exclusive_open, .open = video_exclusive_open,
release: video_exclusive_release, .release = video_exclusive_release,
ioctl: tt_ioctl, .ioctl = tt_ioctl,
llseek: no_llseek, .llseek = no_llseek,
}; };
static struct video_device terratec_radio= static struct video_device terratec_radio=
{ {
owner: THIS_MODULE, .owner = THIS_MODULE,
name: "TerraTec ActiveRadio", .name = "TerraTec ActiveRadio",
type: VID_TYPE_TUNER, .type = VID_TYPE_TUNER,
hardware: VID_HARDWARE_TERRATEC, .hardware = VID_HARDWARE_TERRATEC,
fops: &terratec_fops, .fops = &terratec_fops,
}; };
static int __init terratec_init(void) static int __init terratec_init(void)
......
...@@ -251,20 +251,20 @@ static int tr_ioctl(struct inode *inode, struct file *file, ...@@ -251,20 +251,20 @@ static int tr_ioctl(struct inode *inode, struct file *file,
} }
static struct file_operations trust_fops = { static struct file_operations trust_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
open: video_exclusive_open, .open = video_exclusive_open,
release: video_exclusive_release, .release = video_exclusive_release,
ioctl: tr_ioctl, .ioctl = tr_ioctl,
llseek: no_llseek, .llseek = no_llseek,
}; };
static struct video_device trust_radio= static struct video_device trust_radio=
{ {
owner: THIS_MODULE, .owner = THIS_MODULE,
name: "Trust FM Radio", .name = "Trust FM Radio",
type: VID_TYPE_TUNER, .type = VID_TYPE_TUNER,
hardware: VID_HARDWARE_TRUST, .hardware = VID_HARDWARE_TRUST,
fops: &trust_fops, .fops = &trust_fops,
}; };
static int __init trust_init(void) static int __init trust_init(void)
......
...@@ -251,26 +251,26 @@ static int typhoon_ioctl(struct inode *inode, struct file *file, ...@@ -251,26 +251,26 @@ static int typhoon_ioctl(struct inode *inode, struct file *file,
static struct typhoon_device typhoon_unit = static struct typhoon_device typhoon_unit =
{ {
iobase: CONFIG_RADIO_TYPHOON_PORT, .iobase = CONFIG_RADIO_TYPHOON_PORT,
curfreq: CONFIG_RADIO_TYPHOON_MUTEFREQ, .curfreq = CONFIG_RADIO_TYPHOON_MUTEFREQ,
mutefreq: CONFIG_RADIO_TYPHOON_MUTEFREQ, .mutefreq = CONFIG_RADIO_TYPHOON_MUTEFREQ,
}; };
static struct file_operations typhoon_fops = { static struct file_operations typhoon_fops = {
owner: THIS_MODULE, .owner = THIS_MODULE,
open: video_exclusive_open, .open = video_exclusive_open,
release: video_exclusive_release, .release = video_exclusive_release,
ioctl: typhoon_ioctl, .ioctl = typhoon_ioctl,
llseek: no_llseek, .llseek = no_llseek,
}; };
static struct video_device typhoon_radio = static struct video_device typhoon_radio =
{ {
owner: THIS_MODULE, .owner = THIS_MODULE,
name: "Typhoon Radio", .name = "Typhoon Radio",
type: VID_TYPE_TUNER, .type = VID_TYPE_TUNER,
hardware: VID_HARDWARE_TYPHOON, .hardware = VID_HARDWARE_TYPHOON,
fops: &typhoon_fops, .fops = &typhoon_fops,
}; };
#ifdef CONFIG_RADIO_TYPHOON_PROC_FS #ifdef CONFIG_RADIO_TYPHOON_PROC_FS
......
...@@ -320,20 +320,20 @@ static struct zol_device zoltrix_unit; ...@@ -320,20 +320,20 @@ static struct zol_device zoltrix_unit;
static struct file_operations zoltrix_fops = static struct file_operations zoltrix_fops =
{ {
owner: THIS_MODULE, .owner = THIS_MODULE,
open: video_exclusive_open, .open = video_exclusive_open,
release: video_exclusive_release, .release = video_exclusive_release,
ioctl: zol_ioctl, .ioctl = zol_ioctl,
llseek: no_llseek, .llseek = no_llseek,
}; };
static struct video_device zoltrix_radio = static struct video_device zoltrix_radio =
{ {
owner: THIS_MODULE, .owner = THIS_MODULE,
name: "Zoltrix Radio Plus", .name = "Zoltrix Radio Plus",
type: VID_TYPE_TUNER, .type = VID_TYPE_TUNER,
hardware: VID_HARDWARE_ZOLTRIX, .hardware = VID_HARDWARE_ZOLTRIX,
fops: &zoltrix_fops, .fops = &zoltrix_fops,
}; };
static int __init zoltrix_init(void) static int __init zoltrix_init(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment