aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/radio
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/radio')
-rw-r--r--drivers/media/radio/dsbr100.c19
-rw-r--r--drivers/media/radio/radio-aimslab.c15
-rw-r--r--drivers/media/radio/radio-aztech.c15
-rw-r--r--drivers/media/radio/radio-cadet.c15
-rw-r--r--drivers/media/radio/radio-gemtek-pci.c14
-rw-r--r--drivers/media/radio/radio-gemtek.c14
-rw-r--r--drivers/media/radio/radio-maestro.c12
-rw-r--r--drivers/media/radio/radio-maxiradio.c16
-rw-r--r--drivers/media/radio/radio-rtrack2.c15
-rw-r--r--drivers/media/radio/radio-sf16fmi.c15
-rw-r--r--drivers/media/radio/radio-sf16fmr2.c15
-rw-r--r--drivers/media/radio/radio-si470x.c21
-rw-r--r--drivers/media/radio/radio-terratec.c15
-rw-r--r--drivers/media/radio/radio-trust.c15
-rw-r--r--drivers/media/radio/radio-typhoon.c15
-rw-r--r--drivers/media/radio/radio-zoltrix.c15
16 files changed, 148 insertions, 98 deletions
diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index 97c6853ad1d3..08bf5e8031da 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -445,14 +445,7 @@ static const struct file_operations usb_dsbr100_fops = {
445 .llseek = no_llseek, 445 .llseek = no_llseek,
446}; 446};
447 447
448/* V4L2 interface */ 448static const struct v4l2_ioctl_ops usb_dsbr100_ioctl_ops = {
449static struct video_device dsbr100_videodev_template =
450{
451 .owner = THIS_MODULE,
452 .name = "D-Link DSB-R 100",
453 .type = VID_TYPE_TUNER,
454 .fops = &usb_dsbr100_fops,
455 .release = video_device_release,
456 .vidioc_querycap = vidioc_querycap, 449 .vidioc_querycap = vidioc_querycap,
457 .vidioc_g_tuner = vidioc_g_tuner, 450 .vidioc_g_tuner = vidioc_g_tuner,
458 .vidioc_s_tuner = vidioc_s_tuner, 451 .vidioc_s_tuner = vidioc_s_tuner,
@@ -467,6 +460,16 @@ static struct video_device dsbr100_videodev_template =
467 .vidioc_s_input = vidioc_s_input, 460 .vidioc_s_input = vidioc_s_input,
468}; 461};
469 462
463/* V4L2 interface */
464static struct video_device dsbr100_videodev_template = {
465 .owner = THIS_MODULE,
466 .name = "D-Link DSB-R 100",
467 .type = VID_TYPE_TUNER,
468 .fops = &usb_dsbr100_fops,
469 .ioctl_ops = &usb_dsbr100_ioctl_ops,
470 .release = video_device_release,
471};
472
470/* check if the device is present and register with v4l and 473/* check if the device is present and register with v4l and
471usb if it is */ 474usb if it is */
472static int usb_dsbr100_probe(struct usb_interface *intf, 475static int usb_dsbr100_probe(struct usb_interface *intf,
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index ec8d64704dd0..be9bd7adaf61 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -389,12 +389,7 @@ static const struct file_operations rtrack_fops = {
389 .llseek = no_llseek, 389 .llseek = no_llseek,
390}; 390};
391 391
392static struct video_device rtrack_radio= 392static const struct v4l2_ioctl_ops rtrack_ioctl_ops = {
393{
394 .owner = THIS_MODULE,
395 .name = "RadioTrack radio",
396 .type = VID_TYPE_TUNER,
397 .fops = &rtrack_fops,
398 .vidioc_querycap = vidioc_querycap, 393 .vidioc_querycap = vidioc_querycap,
399 .vidioc_g_tuner = vidioc_g_tuner, 394 .vidioc_g_tuner = vidioc_g_tuner,
400 .vidioc_s_tuner = vidioc_s_tuner, 395 .vidioc_s_tuner = vidioc_s_tuner,
@@ -409,6 +404,14 @@ static struct video_device rtrack_radio=
409 .vidioc_s_ctrl = vidioc_s_ctrl, 404 .vidioc_s_ctrl = vidioc_s_ctrl,
410}; 405};
411 406
407static struct video_device rtrack_radio = {
408 .owner = THIS_MODULE,
409 .name = "RadioTrack radio",
410 .type = VID_TYPE_TUNER,
411 .fops = &rtrack_fops,
412 .ioctl_ops = &rtrack_ioctl_ops,
413};
414
412static int __init rtrack_init(void) 415static int __init rtrack_init(void)
413{ 416{
414 if(io==-1) 417 if(io==-1)
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 639164a974a1..04c738b62d06 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -353,12 +353,7 @@ static const struct file_operations aztech_fops = {
353 .llseek = no_llseek, 353 .llseek = no_llseek,
354}; 354};
355 355
356static struct video_device aztech_radio= 356static const struct v4l2_ioctl_ops aztech_ioctl_ops = {
357{
358 .owner = THIS_MODULE,
359 .name = "Aztech radio",
360 .type = VID_TYPE_TUNER,
361 .fops = &aztech_fops,
362 .vidioc_querycap = vidioc_querycap, 357 .vidioc_querycap = vidioc_querycap,
363 .vidioc_g_tuner = vidioc_g_tuner, 358 .vidioc_g_tuner = vidioc_g_tuner,
364 .vidioc_s_tuner = vidioc_s_tuner, 359 .vidioc_s_tuner = vidioc_s_tuner,
@@ -373,6 +368,14 @@ static struct video_device aztech_radio=
373 .vidioc_s_ctrl = vidioc_s_ctrl, 368 .vidioc_s_ctrl = vidioc_s_ctrl,
374}; 369};
375 370
371static struct video_device aztech_radio = {
372 .owner = THIS_MODULE,
373 .name = "Aztech radio",
374 .type = VID_TYPE_TUNER,
375 .fops = &aztech_fops,
376 .ioctl_ops = &aztech_ioctl_ops,
377};
378
376module_param_named(debug,aztech_radio.debug, int, 0644); 379module_param_named(debug,aztech_radio.debug, int, 0644);
377MODULE_PARM_DESC(debug,"activates debug info"); 380MODULE_PARM_DESC(debug,"activates debug info");
378 381
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 484ea87d7fba..36b850fc14b4 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -570,12 +570,7 @@ static const struct file_operations cadet_fops = {
570 .llseek = no_llseek, 570 .llseek = no_llseek,
571}; 571};
572 572
573static struct video_device cadet_radio= 573static const struct v4l2_ioctl_ops cadet_ioctl_ops = {
574{
575 .owner = THIS_MODULE,
576 .name = "Cadet radio",
577 .type = VID_TYPE_TUNER,
578 .fops = &cadet_fops,
579 .vidioc_querycap = vidioc_querycap, 574 .vidioc_querycap = vidioc_querycap,
580 .vidioc_g_tuner = vidioc_g_tuner, 575 .vidioc_g_tuner = vidioc_g_tuner,
581 .vidioc_s_tuner = vidioc_s_tuner, 576 .vidioc_s_tuner = vidioc_s_tuner,
@@ -590,6 +585,14 @@ static struct video_device cadet_radio=
590 .vidioc_s_input = vidioc_s_input, 585 .vidioc_s_input = vidioc_s_input,
591}; 586};
592 587
588static struct video_device cadet_radio = {
589 .owner = THIS_MODULE,
590 .name = "Cadet radio",
591 .type = VID_TYPE_TUNER,
592 .fops = &cadet_fops,
593 .ioctl_ops = &cadet_ioctl_ops,
594};
595
593#ifdef CONFIG_PNP 596#ifdef CONFIG_PNP
594 597
595static struct pnp_device_id cadet_pnp_devices[] = { 598static struct pnp_device_id cadet_pnp_devices[] = {
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index 2b834b95f3e7..c41b35f3b125 100644
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -375,11 +375,7 @@ static const struct file_operations gemtek_pci_fops = {
375 .llseek = no_llseek, 375 .llseek = no_llseek,
376}; 376};
377 377
378static struct video_device vdev_template = { 378static const struct v4l2_ioctl_ops gemtek_pci_ioctl_ops = {
379 .owner = THIS_MODULE,
380 .name = "Gemtek PCI Radio",
381 .type = VID_TYPE_TUNER,
382 .fops = &gemtek_pci_fops,
383 .vidioc_querycap = vidioc_querycap, 379 .vidioc_querycap = vidioc_querycap,
384 .vidioc_g_tuner = vidioc_g_tuner, 380 .vidioc_g_tuner = vidioc_g_tuner,
385 .vidioc_s_tuner = vidioc_s_tuner, 381 .vidioc_s_tuner = vidioc_s_tuner,
@@ -394,6 +390,14 @@ static struct video_device vdev_template = {
394 .vidioc_s_ctrl = vidioc_s_ctrl, 390 .vidioc_s_ctrl = vidioc_s_ctrl,
395}; 391};
396 392
393static struct video_device vdev_template = {
394 .owner = THIS_MODULE,
395 .name = "Gemtek PCI Radio",
396 .type = VID_TYPE_TUNER,
397 .fops = &gemtek_pci_fops,
398 .ioctl_ops = &gemtek_pci_ioctl_ops,
399};
400
397static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci_device_id *pci_id ) 401static int __devinit gemtek_pci_probe( struct pci_dev *pci_dev, const struct pci_device_id *pci_id )
398{ 402{
399 struct gemtek_pci_card *card; 403 struct gemtek_pci_card *card;
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index 4740bacc2f88..f82b59f35e33 100644
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -553,11 +553,7 @@ static int vidioc_s_audio(struct file *file, void *priv, struct v4l2_audio *a)
553 return 0; 553 return 0;
554} 554}
555 555
556static struct video_device gemtek_radio = { 556static const struct v4l2_ioctl_ops gemtek_ioctl_ops = {
557 .owner = THIS_MODULE,
558 .name = "GemTek Radio card",
559 .type = VID_TYPE_TUNER,
560 .fops = &gemtek_fops,
561 .vidioc_querycap = vidioc_querycap, 557 .vidioc_querycap = vidioc_querycap,
562 .vidioc_g_tuner = vidioc_g_tuner, 558 .vidioc_g_tuner = vidioc_g_tuner,
563 .vidioc_s_tuner = vidioc_s_tuner, 559 .vidioc_s_tuner = vidioc_s_tuner,
@@ -572,6 +568,14 @@ static struct video_device gemtek_radio = {
572 .vidioc_s_ctrl = vidioc_s_ctrl 568 .vidioc_s_ctrl = vidioc_s_ctrl
573}; 569};
574 570
571static struct video_device gemtek_radio = {
572 .owner = THIS_MODULE,
573 .name = "GemTek Radio card",
574 .type = VID_TYPE_TUNER,
575 .fops = &gemtek_fops,
576 .ioctl_ops = &gemtek_ioctl_ops,
577};
578
575/* 579/*
576 * Initialization / cleanup related stuff. 580 * Initialization / cleanup related stuff.
577 */ 581 */
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
index 040a73fac694..d074a8c90674 100644
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -355,10 +355,7 @@ static u16 __devinit radio_power_on(struct radio_device *dev)
355 return (ofreq == radio_bits_get(dev)); 355 return (ofreq == radio_bits_get(dev));
356} 356}
357 357
358static struct video_device maestro_radio = { 358static const struct v4l2_ioctl_ops maestro_ioctl_ops = {
359 .name = "Maestro radio",
360 .type = VID_TYPE_TUNER,
361 .fops = &maestro_fops,
362 .vidioc_querycap = vidioc_querycap, 359 .vidioc_querycap = vidioc_querycap,
363 .vidioc_g_tuner = vidioc_g_tuner, 360 .vidioc_g_tuner = vidioc_g_tuner,
364 .vidioc_s_tuner = vidioc_s_tuner, 361 .vidioc_s_tuner = vidioc_s_tuner,
@@ -373,6 +370,13 @@ static struct video_device maestro_radio = {
373 .vidioc_s_ctrl = vidioc_s_ctrl, 370 .vidioc_s_ctrl = vidioc_s_ctrl,
374}; 371};
375 372
373static struct video_device maestro_radio = {
374 .name = "Maestro radio",
375 .type = VID_TYPE_TUNER,
376 .fops = &maestro_fops,
377 .ioctl_ops = &maestro_ioctl_ops,
378};
379
376static int __devinit maestro_probe(struct pci_dev *pdev, 380static int __devinit maestro_probe(struct pci_dev *pdev,
377 const struct pci_device_id *ent) 381 const struct pci_device_id *ent)
378{ 382{
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 9e824a7d5cc4..780516daebba 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -374,13 +374,7 @@ static int vidioc_s_ctrl (struct file *file, void *priv,
374 return -EINVAL; 374 return -EINVAL;
375} 375}
376 376
377static struct video_device maxiradio_radio = 377static const struct v4l2_ioctl_ops maxiradio_ioctl_ops = {
378{
379 .owner = THIS_MODULE,
380 .name = "Maxi Radio FM2000 radio",
381 .type = VID_TYPE_TUNER,
382 .fops = &maxiradio_fops,
383
384 .vidioc_querycap = vidioc_querycap, 378 .vidioc_querycap = vidioc_querycap,
385 .vidioc_g_tuner = vidioc_g_tuner, 379 .vidioc_g_tuner = vidioc_g_tuner,
386 .vidioc_s_tuner = vidioc_s_tuner, 380 .vidioc_s_tuner = vidioc_s_tuner,
@@ -395,6 +389,14 @@ static struct video_device maxiradio_radio =
395 .vidioc_s_ctrl = vidioc_s_ctrl, 389 .vidioc_s_ctrl = vidioc_s_ctrl,
396}; 390};
397 391
392static struct video_device maxiradio_radio = {
393 .owner = THIS_MODULE,
394 .name = "Maxi Radio FM2000 radio",
395 .type = VID_TYPE_TUNER,
396 .fops = &maxiradio_fops,
397 .ioctl_ops = &maxiradio_ioctl_ops,
398};
399
398static int __devinit maxiradio_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 400static int __devinit maxiradio_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
399{ 401{
400 if(!request_region(pci_resource_start(pdev, 0), 402 if(!request_region(pci_resource_start(pdev, 0),
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index c3fb270f211b..045ae9d1067c 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -295,12 +295,7 @@ static const struct file_operations rtrack2_fops = {
295 .llseek = no_llseek, 295 .llseek = no_llseek,
296}; 296};
297 297
298static struct video_device rtrack2_radio= 298static const struct v4l2_ioctl_ops rtrack2_ioctl_ops = {
299{
300 .owner = THIS_MODULE,
301 .name = "RadioTrack II radio",
302 .type = VID_TYPE_TUNER,
303 .fops = &rtrack2_fops,
304 .vidioc_querycap = vidioc_querycap, 299 .vidioc_querycap = vidioc_querycap,
305 .vidioc_g_tuner = vidioc_g_tuner, 300 .vidioc_g_tuner = vidioc_g_tuner,
306 .vidioc_s_tuner = vidioc_s_tuner, 301 .vidioc_s_tuner = vidioc_s_tuner,
@@ -315,6 +310,14 @@ static struct video_device rtrack2_radio=
315 .vidioc_s_input = vidioc_s_input, 310 .vidioc_s_input = vidioc_s_input,
316}; 311};
317 312
313static struct video_device rtrack2_radio = {
314 .owner = THIS_MODULE,
315 .name = "RadioTrack II radio",
316 .type = VID_TYPE_TUNER,
317 .fops = &rtrack2_fops,
318 .ioctl_ops = &rtrack2_ioctl_ops,
319};
320
318static int __init rtrack2_init(void) 321static int __init rtrack2_init(void)
319{ 322{
320 if(io==-1) 323 if(io==-1)
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index bb8b1c9107b1..75b68a024541 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -295,12 +295,7 @@ static const struct file_operations fmi_fops = {
295 .llseek = no_llseek, 295 .llseek = no_llseek,
296}; 296};
297 297
298static struct video_device fmi_radio= 298static const struct v4l2_ioctl_ops fmi_ioctl_ops = {
299{
300 .owner = THIS_MODULE,
301 .name = "SF16FMx radio",
302 .type = VID_TYPE_TUNER,
303 .fops = &fmi_fops,
304 .vidioc_querycap = vidioc_querycap, 299 .vidioc_querycap = vidioc_querycap,
305 .vidioc_g_tuner = vidioc_g_tuner, 300 .vidioc_g_tuner = vidioc_g_tuner,
306 .vidioc_s_tuner = vidioc_s_tuner, 301 .vidioc_s_tuner = vidioc_s_tuner,
@@ -315,6 +310,14 @@ static struct video_device fmi_radio=
315 .vidioc_s_ctrl = vidioc_s_ctrl, 310 .vidioc_s_ctrl = vidioc_s_ctrl,
316}; 311};
317 312
313static struct video_device fmi_radio = {
314 .owner = THIS_MODULE,
315 .name = "SF16FMx radio",
316 .type = VID_TYPE_TUNER,
317 .fops = &fmi_fops,
318 .ioctl_ops = &fmi_ioctl_ops,
319};
320
318/* ladis: this is my card. does any other types exist? */ 321/* ladis: this is my card. does any other types exist? */
319static struct isapnp_device_id id_table[] __devinitdata = { 322static struct isapnp_device_id id_table[] __devinitdata = {
320 { ISAPNP_ANY_ID, ISAPNP_ANY_ID, 323 { ISAPNP_ANY_ID, ISAPNP_ANY_ID,
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index 9fa025b704cb..5ffddce80011 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -411,12 +411,7 @@ static const struct file_operations fmr2_fops = {
411 .llseek = no_llseek, 411 .llseek = no_llseek,
412}; 412};
413 413
414static struct video_device fmr2_radio= 414static const struct v4l2_ioctl_ops fmr2_ioctl_ops = {
415{
416 .owner = THIS_MODULE,
417 .name = "SF16FMR2 radio",
418 . type = VID_TYPE_TUNER,
419 .fops = &fmr2_fops,
420 .vidioc_querycap = vidioc_querycap, 415 .vidioc_querycap = vidioc_querycap,
421 .vidioc_g_tuner = vidioc_g_tuner, 416 .vidioc_g_tuner = vidioc_g_tuner,
422 .vidioc_s_tuner = vidioc_s_tuner, 417 .vidioc_s_tuner = vidioc_s_tuner,
@@ -431,6 +426,14 @@ static struct video_device fmr2_radio=
431 .vidioc_s_ctrl = vidioc_s_ctrl, 426 .vidioc_s_ctrl = vidioc_s_ctrl,
432}; 427};
433 428
429static struct video_device fmr2_radio = {
430 .owner = THIS_MODULE,
431 .name = "SF16FMR2 radio",
432 .type = VID_TYPE_TUNER,
433 .fops = &fmr2_fops,
434 .ioctl_ops = &fmr2_ioctl_ops,
435};
436
434static int __init fmr2_init(void) 437static int __init fmr2_init(void)
435{ 438{
436 fmr2_unit.port = io; 439 fmr2_unit.port = io;
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c
index 333612180176..b829c67ecf0c 100644
--- a/drivers/media/radio/radio-si470x.c
+++ b/drivers/media/radio/radio-si470x.c
@@ -1586,15 +1586,7 @@ done:
1586 return retval; 1586 return retval;
1587} 1587}
1588 1588
1589 1589static const struct v4l2_ioctl_ops si470x_ioctl_ops = {
1590/*
1591 * si470x_viddev_tamples - video device interface
1592 */
1593static struct video_device si470x_viddev_template = {
1594 .fops = &si470x_fops,
1595 .name = DRIVER_NAME,
1596 .type = VID_TYPE_TUNER,
1597 .release = video_device_release,
1598 .vidioc_querycap = si470x_vidioc_querycap, 1590 .vidioc_querycap = si470x_vidioc_querycap,
1599 .vidioc_g_input = si470x_vidioc_g_input, 1591 .vidioc_g_input = si470x_vidioc_g_input,
1600 .vidioc_s_input = si470x_vidioc_s_input, 1592 .vidioc_s_input = si470x_vidioc_s_input,
@@ -1608,6 +1600,17 @@ static struct video_device si470x_viddev_template = {
1608 .vidioc_g_frequency = si470x_vidioc_g_frequency, 1600 .vidioc_g_frequency = si470x_vidioc_g_frequency,
1609 .vidioc_s_frequency = si470x_vidioc_s_frequency, 1601 .vidioc_s_frequency = si470x_vidioc_s_frequency,
1610 .vidioc_s_hw_freq_seek = si470x_vidioc_s_hw_freq_seek, 1602 .vidioc_s_hw_freq_seek = si470x_vidioc_s_hw_freq_seek,
1603};
1604
1605/*
1606 * si470x_viddev_tamples - video device interface
1607 */
1608static struct video_device si470x_viddev_template = {
1609 .fops = &si470x_fops,
1610 .ioctl_ops = &si470x_ioctl_ops,
1611 .name = DRIVER_NAME,
1612 .type = VID_TYPE_TUNER,
1613 .release = video_device_release,
1611 .owner = THIS_MODULE, 1614 .owner = THIS_MODULE,
1612}; 1615};
1613 1616
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index a9914dbcf493..3a67471f999c 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -367,12 +367,7 @@ static const struct file_operations terratec_fops = {
367 .llseek = no_llseek, 367 .llseek = no_llseek,
368}; 368};
369 369
370static struct video_device terratec_radio= 370static const struct v4l2_ioctl_ops terratec_ioctl_ops = {
371{
372 .owner = THIS_MODULE,
373 .name = "TerraTec ActiveRadio",
374 .type = VID_TYPE_TUNER,
375 .fops = &terratec_fops,
376 .vidioc_querycap = vidioc_querycap, 371 .vidioc_querycap = vidioc_querycap,
377 .vidioc_g_tuner = vidioc_g_tuner, 372 .vidioc_g_tuner = vidioc_g_tuner,
378 .vidioc_s_tuner = vidioc_s_tuner, 373 .vidioc_s_tuner = vidioc_s_tuner,
@@ -387,6 +382,14 @@ static struct video_device terratec_radio=
387 .vidioc_s_input = vidioc_s_input, 382 .vidioc_s_input = vidioc_s_input,
388}; 383};
389 384
385static struct video_device terratec_radio = {
386 .owner = THIS_MODULE,
387 .name = "TerraTec ActiveRadio",
388 .type = VID_TYPE_TUNER,
389 .fops = &terratec_fops,
390 .ioctl_ops = &terratec_ioctl_ops,
391};
392
390static int __init terratec_init(void) 393static int __init terratec_init(void)
391{ 394{
392 if(io==-1) 395 if(io==-1)
diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c
index 560c49481a2d..e33400180915 100644
--- a/drivers/media/radio/radio-trust.c
+++ b/drivers/media/radio/radio-trust.c
@@ -347,12 +347,7 @@ static const struct file_operations trust_fops = {
347 .llseek = no_llseek, 347 .llseek = no_llseek,
348}; 348};
349 349
350static struct video_device trust_radio= 350static const struct v4l2_ioctl_ops trust_ioctl_ops = {
351{
352 .owner = THIS_MODULE,
353 .name = "Trust FM Radio",
354 .type = VID_TYPE_TUNER,
355 .fops = &trust_fops,
356 .vidioc_querycap = vidioc_querycap, 351 .vidioc_querycap = vidioc_querycap,
357 .vidioc_g_tuner = vidioc_g_tuner, 352 .vidioc_g_tuner = vidioc_g_tuner,
358 .vidioc_s_tuner = vidioc_s_tuner, 353 .vidioc_s_tuner = vidioc_s_tuner,
@@ -367,6 +362,14 @@ static struct video_device trust_radio=
367 .vidioc_s_input = vidioc_s_input, 362 .vidioc_s_input = vidioc_s_input,
368}; 363};
369 364
365static struct video_device trust_radio = {
366 .owner = THIS_MODULE,
367 .name = "Trust FM Radio",
368 .type = VID_TYPE_TUNER,
369 .fops = &trust_fops,
370 .ioctl_ops = &trust_ioctl_ops,
371};
372
370static int __init trust_init(void) 373static int __init trust_init(void)
371{ 374{
372 if(io == -1) { 375 if(io == -1) {
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index 023d6f3c751c..48b5d2bc6276 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -345,12 +345,7 @@ static const struct file_operations typhoon_fops = {
345 .llseek = no_llseek, 345 .llseek = no_llseek,
346}; 346};
347 347
348static struct video_device typhoon_radio = 348static const struct v4l2_ioctl_ops typhoon_ioctl_ops = {
349{
350 .owner = THIS_MODULE,
351 .name = "Typhoon Radio",
352 .type = VID_TYPE_TUNER,
353 .fops = &typhoon_fops,
354 .vidioc_querycap = vidioc_querycap, 349 .vidioc_querycap = vidioc_querycap,
355 .vidioc_g_tuner = vidioc_g_tuner, 350 .vidioc_g_tuner = vidioc_g_tuner,
356 .vidioc_s_tuner = vidioc_s_tuner, 351 .vidioc_s_tuner = vidioc_s_tuner,
@@ -365,6 +360,14 @@ static struct video_device typhoon_radio =
365 .vidioc_s_ctrl = vidioc_s_ctrl, 360 .vidioc_s_ctrl = vidioc_s_ctrl,
366}; 361};
367 362
363static struct video_device typhoon_radio = {
364 .owner = THIS_MODULE,
365 .name = "Typhoon Radio",
366 .type = VID_TYPE_TUNER,
367 .fops = &typhoon_fops,
368 .ioctl_ops = &typhoon_ioctl_ops,
369};
370
368#ifdef CONFIG_RADIO_TYPHOON_PROC_FS 371#ifdef CONFIG_RADIO_TYPHOON_PROC_FS
369 372
370static int typhoon_proc_show(struct seq_file *m, void *v) 373static int typhoon_proc_show(struct seq_file *m, void *v)
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index cf0355bb6ef7..c60344326cd6 100644
--- a/drivers/media/radio/radio-zoltrix.c
+++ b/drivers/media/radio/radio-zoltrix.c
@@ -408,12 +408,7 @@ static const struct file_operations zoltrix_fops =
408 .llseek = no_llseek, 408 .llseek = no_llseek,
409}; 409};
410 410
411static struct video_device zoltrix_radio = 411static const struct v4l2_ioctl_ops zoltrix_ioctl_ops = {
412{
413 .owner = THIS_MODULE,
414 .name = "Zoltrix Radio Plus",
415 .type = VID_TYPE_TUNER,
416 .fops = &zoltrix_fops,
417 .vidioc_querycap = vidioc_querycap, 412 .vidioc_querycap = vidioc_querycap,
418 .vidioc_g_tuner = vidioc_g_tuner, 413 .vidioc_g_tuner = vidioc_g_tuner,
419 .vidioc_s_tuner = vidioc_s_tuner, 414 .vidioc_s_tuner = vidioc_s_tuner,
@@ -428,6 +423,14 @@ static struct video_device zoltrix_radio =
428 .vidioc_s_ctrl = vidioc_s_ctrl, 423 .vidioc_s_ctrl = vidioc_s_ctrl,
429}; 424};
430 425
426static struct video_device zoltrix_radio = {
427 .owner = THIS_MODULE,
428 .name = "Zoltrix Radio Plus",
429 .type = VID_TYPE_TUNER,
430 .fops = &zoltrix_fops,
431 .ioctl_ops = &zoltrix_ioctl_ops,
432};
433
431static int __init zoltrix_init(void) 434static int __init zoltrix_init(void)
432{ 435{
433 if (io == -1) { 436 if (io == -1) {
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-23 16:24:15 -0500