aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/radio
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-07-26 07:26:43 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 10:07:10 -0400
commit0ea6bc8d43c9ee3c5384bea184eab020927a5b2c (patch)
treef8e4988ac5612179b5fdd906e375bd1fde7ed636 /drivers/media/radio
parentc52e4f5836cff0a70a25665f475cf5294c9fe5eb (diff)
V4L/DVB (8523): v4l2-dev: remove unused type and type2 field from video_device
The type and type2 fields were unused and so could be removed. Instead add a vfl_type field that contains the type of the video device. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/radio')
-rw-r--r--drivers/media/radio/dsbr100.c1
-rw-r--r--drivers/media/radio/miropcm20-radio.c1
-rw-r--r--drivers/media/radio/radio-aimslab.c1
-rw-r--r--drivers/media/radio/radio-aztech.c1
-rw-r--r--drivers/media/radio/radio-cadet.c1
-rw-r--r--drivers/media/radio/radio-gemtek-pci.c1
-rw-r--r--drivers/media/radio/radio-gemtek.c1
-rw-r--r--drivers/media/radio/radio-maestro.c1
-rw-r--r--drivers/media/radio/radio-maxiradio.c1
-rw-r--r--drivers/media/radio/radio-rtrack2.c1
-rw-r--r--drivers/media/radio/radio-sf16fmi.c1
-rw-r--r--drivers/media/radio/radio-sf16fmr2.c1
-rw-r--r--drivers/media/radio/radio-si470x.c1
-rw-r--r--drivers/media/radio/radio-terratec.c1
-rw-r--r--drivers/media/radio/radio-trust.c1
-rw-r--r--drivers/media/radio/radio-typhoon.c1
-rw-r--r--drivers/media/radio/radio-zoltrix.c1
17 files changed, 0 insertions, 17 deletions
diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index 0edada6f4b31..1ed88f3abe61 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -463,7 +463,6 @@ static const struct v4l2_ioctl_ops usb_dsbr100_ioctl_ops = {
463/* V4L2 interface */ 463/* V4L2 interface */
464static struct video_device dsbr100_videodev_template = { 464static struct video_device dsbr100_videodev_template = {
465 .name = "D-Link DSB-R 100", 465 .name = "D-Link DSB-R 100",
466 .type = VID_TYPE_TUNER,
467 .fops = &usb_dsbr100_fops, 466 .fops = &usb_dsbr100_fops,
468 .ioctl_ops = &usb_dsbr100_ioctl_ops, 467 .ioctl_ops = &usb_dsbr100_ioctl_ops,
469 .release = video_device_release, 468 .release = video_device_release,
diff --git a/drivers/media/radio/miropcm20-radio.c b/drivers/media/radio/miropcm20-radio.c
index 594e246dfcff..7fd7ee2d32c1 100644
--- a/drivers/media/radio/miropcm20-radio.c
+++ b/drivers/media/radio/miropcm20-radio.c
@@ -230,7 +230,6 @@ static const struct file_operations pcm20_fops = {
230 230
231static struct video_device pcm20_radio = { 231static struct video_device pcm20_radio = {
232 .name = "Miro PCM 20 radio", 232 .name = "Miro PCM 20 radio",
233 .type = VID_TYPE_TUNER,
234 .fops = &pcm20_fops, 233 .fops = &pcm20_fops,
235 .priv = &pcm20_unit 234 .priv = &pcm20_unit
236}; 235};
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index 2540df6dc2c8..eba9209b3024 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -406,7 +406,6 @@ static const struct v4l2_ioctl_ops rtrack_ioctl_ops = {
406 406
407static struct video_device rtrack_radio = { 407static struct video_device rtrack_radio = {
408 .name = "RadioTrack radio", 408 .name = "RadioTrack radio",
409 .type = VID_TYPE_TUNER,
410 .fops = &rtrack_fops, 409 .fops = &rtrack_fops,
411 .ioctl_ops = &rtrack_ioctl_ops, 410 .ioctl_ops = &rtrack_ioctl_ops,
412}; 411};
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 537f2f479506..3fe5504428c5 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -370,7 +370,6 @@ static const struct v4l2_ioctl_ops aztech_ioctl_ops = {
370 370
371static struct video_device aztech_radio = { 371static struct video_device aztech_radio = {
372 .name = "Aztech radio", 372 .name = "Aztech radio",
373 .type = VID_TYPE_TUNER,
374 .fops = &aztech_fops, 373 .fops = &aztech_fops,
375 .ioctl_ops = &aztech_ioctl_ops, 374 .ioctl_ops = &aztech_ioctl_ops,
376}; 375};
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 362a279f0680..6166e726ed72 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -587,7 +587,6 @@ static const struct v4l2_ioctl_ops cadet_ioctl_ops = {
587 587
588static struct video_device cadet_radio = { 588static struct video_device cadet_radio = {
589 .name = "Cadet radio", 589 .name = "Cadet radio",
590 .type = VID_TYPE_TUNER,
591 .fops = &cadet_fops, 590 .fops = &cadet_fops,
592 .ioctl_ops = &cadet_ioctl_ops, 591 .ioctl_ops = &cadet_ioctl_ops,
593}; 592};
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index b8c515762b49..36e754e3ffb2 100644
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -392,7 +392,6 @@ static const struct v4l2_ioctl_ops gemtek_pci_ioctl_ops = {
392 392
393static struct video_device vdev_template = { 393static struct video_device vdev_template = {
394 .name = "Gemtek PCI Radio", 394 .name = "Gemtek PCI Radio",
395 .type = VID_TYPE_TUNER,
396 .fops = &gemtek_pci_fops, 395 .fops = &gemtek_pci_fops,
397 .ioctl_ops = &gemtek_pci_ioctl_ops, 396 .ioctl_ops = &gemtek_pci_ioctl_ops,
398}; 397};
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index 45b47c1643ee..2b1a6221de6d 100644
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -570,7 +570,6 @@ static const struct v4l2_ioctl_ops gemtek_ioctl_ops = {
570 570
571static struct video_device gemtek_radio = { 571static struct video_device gemtek_radio = {
572 .name = "GemTek Radio card", 572 .name = "GemTek Radio card",
573 .type = VID_TYPE_TUNER,
574 .fops = &gemtek_fops, 573 .fops = &gemtek_fops,
575 .ioctl_ops = &gemtek_ioctl_ops, 574 .ioctl_ops = &gemtek_ioctl_ops,
576}; 575};
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
index d074a8c90674..0ada1c697e8a 100644
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -372,7 +372,6 @@ static const struct v4l2_ioctl_ops maestro_ioctl_ops = {
372 372
373static struct video_device maestro_radio = { 373static struct video_device maestro_radio = {
374 .name = "Maestro radio", 374 .name = "Maestro radio",
375 .type = VID_TYPE_TUNER,
376 .fops = &maestro_fops, 375 .fops = &maestro_fops,
377 .ioctl_ops = &maestro_ioctl_ops, 376 .ioctl_ops = &maestro_ioctl_ops,
378}; 377};
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 1b9099606494..43c75497dc49 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -391,7 +391,6 @@ static const struct v4l2_ioctl_ops maxiradio_ioctl_ops = {
391 391
392static struct video_device maxiradio_radio = { 392static struct video_device maxiradio_radio = {
393 .name = "Maxi Radio FM2000 radio", 393 .name = "Maxi Radio FM2000 radio",
394 .type = VID_TYPE_TUNER,
395 .fops = &maxiradio_fops, 394 .fops = &maxiradio_fops,
396 .ioctl_ops = &maxiradio_ioctl_ops, 395 .ioctl_ops = &maxiradio_ioctl_ops,
397}; 396};
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index e065cb16dc5a..e2dde0807268 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -312,7 +312,6 @@ static const struct v4l2_ioctl_ops rtrack2_ioctl_ops = {
312 312
313static struct video_device rtrack2_radio = { 313static struct video_device rtrack2_radio = {
314 .name = "RadioTrack II radio", 314 .name = "RadioTrack II radio",
315 .type = VID_TYPE_TUNER,
316 .fops = &rtrack2_fops, 315 .fops = &rtrack2_fops,
317 .ioctl_ops = &rtrack2_ioctl_ops, 316 .ioctl_ops = &rtrack2_ioctl_ops,
318}; 317};
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index 975f8521848a..bb5d92f104af 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -312,7 +312,6 @@ static const struct v4l2_ioctl_ops fmi_ioctl_ops = {
312 312
313static struct video_device fmi_radio = { 313static struct video_device fmi_radio = {
314 .name = "SF16FMx radio", 314 .name = "SF16FMx radio",
315 .type = VID_TYPE_TUNER,
316 .fops = &fmi_fops, 315 .fops = &fmi_fops,
317 .ioctl_ops = &fmi_ioctl_ops, 316 .ioctl_ops = &fmi_ioctl_ops,
318}; 317};
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index 2786722b4946..6290553d24be 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -428,7 +428,6 @@ static const struct v4l2_ioctl_ops fmr2_ioctl_ops = {
428 428
429static struct video_device fmr2_radio = { 429static struct video_device fmr2_radio = {
430 .name = "SF16FMR2 radio", 430 .name = "SF16FMR2 radio",
431 .type = VID_TYPE_TUNER,
432 .fops = &fmr2_fops, 431 .fops = &fmr2_fops,
433 .ioctl_ops = &fmr2_ioctl_ops, 432 .ioctl_ops = &fmr2_ioctl_ops,
434}; 433};
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c
index 3cf78ccdc58f..a4984ff87c9c 100644
--- a/drivers/media/radio/radio-si470x.c
+++ b/drivers/media/radio/radio-si470x.c
@@ -1609,7 +1609,6 @@ static struct video_device si470x_viddev_template = {
1609 .fops = &si470x_fops, 1609 .fops = &si470x_fops,
1610 .ioctl_ops = &si470x_ioctl_ops, 1610 .ioctl_ops = &si470x_ioctl_ops,
1611 .name = DRIVER_NAME, 1611 .name = DRIVER_NAME,
1612 .type = VID_TYPE_TUNER,
1613 .release = video_device_release, 1612 .release = video_device_release,
1614}; 1613};
1615 1614
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index b3f669d0691f..cefa44fc5aed 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -384,7 +384,6 @@ static const struct v4l2_ioctl_ops terratec_ioctl_ops = {
384 384
385static struct video_device terratec_radio = { 385static struct video_device terratec_radio = {
386 .name = "TerraTec ActiveRadio", 386 .name = "TerraTec ActiveRadio",
387 .type = VID_TYPE_TUNER,
388 .fops = &terratec_fops, 387 .fops = &terratec_fops,
389 .ioctl_ops = &terratec_ioctl_ops, 388 .ioctl_ops = &terratec_ioctl_ops,
390}; 389};
diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c
index 74aefda868e6..d70172d23edb 100644
--- a/drivers/media/radio/radio-trust.c
+++ b/drivers/media/radio/radio-trust.c
@@ -364,7 +364,6 @@ static const struct v4l2_ioctl_ops trust_ioctl_ops = {
364 364
365static struct video_device trust_radio = { 365static struct video_device trust_radio = {
366 .name = "Trust FM Radio", 366 .name = "Trust FM Radio",
367 .type = VID_TYPE_TUNER,
368 .fops = &trust_fops, 367 .fops = &trust_fops,
369 .ioctl_ops = &trust_ioctl_ops, 368 .ioctl_ops = &trust_ioctl_ops,
370}; 369};
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index 6eb39b7ab75e..f8d62cfea774 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -362,7 +362,6 @@ static const struct v4l2_ioctl_ops typhoon_ioctl_ops = {
362 362
363static struct video_device typhoon_radio = { 363static struct video_device typhoon_radio = {
364 .name = "Typhoon Radio", 364 .name = "Typhoon Radio",
365 .type = VID_TYPE_TUNER,
366 .fops = &typhoon_fops, 365 .fops = &typhoon_fops,
367 .ioctl_ops = &typhoon_ioctl_ops, 366 .ioctl_ops = &typhoon_ioctl_ops,
368}; 367};
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index 4afcb09a4af3..9f17a332fa11 100644
--- a/drivers/media/radio/radio-zoltrix.c
+++ b/drivers/media/radio/radio-zoltrix.c
@@ -425,7 +425,6 @@ static const struct v4l2_ioctl_ops zoltrix_ioctl_ops = {
425 425
426static struct video_device zoltrix_radio = { 426static struct video_device zoltrix_radio = {
427 .name = "Zoltrix Radio Plus", 427 .name = "Zoltrix Radio Plus",
428 .type = VID_TYPE_TUNER,
429 .fops = &zoltrix_fops, 428 .fops = &zoltrix_fops,
430 .ioctl_ops = &zoltrix_ioctl_ops, 429 .ioctl_ops = &zoltrix_ioctl_ops,
431}; 430};