V4L/DVB (11391): pci-isa radios: remove open and release functions

Patch removes empty open and release functions in pci and isa radio
drivers, setting them to NULL. V4L module doesn't call for them due to
previous patch.

Signed-off-by: Alexey Klimov <klimov.linux@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index ac82e33..35edee0 100644 (file)
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -355,20 +355,8 @@ static int vidioc_s_audio(struct file *file, void *priv,
        return a->index ? -EINVAL : 0;
 }
 
-static int rtrack_open(struct file *file)
-{
-       return 0;
-}
-
-static int rtrack_release(struct file *file)
-{
-       return 0;
-}
-
 static const struct v4l2_file_operations rtrack_fops = {
        .owner          = THIS_MODULE,
-       .open           = rtrack_open,
-       .release        = rtrack_release,
        .ioctl          = video_ioctl2,
 };
 

diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 49299f7..8daf809 100644 (file)
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -318,20 +318,8 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
        return -EINVAL;
 }
 
-static int aztech_open(struct file *file)
-{
-       return 0;
-}
-
-static int aztech_release(struct file *file)
-{
-       return 0;
-}
-
 static const struct v4l2_file_operations aztech_fops = {
        .owner          = THIS_MODULE,
-       .open           = aztech_open,
-       .release        = aztech_release,
        .ioctl          = video_ioctl2,
 };
 

diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index 09265d2..c3f579d 100644 (file)
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -356,20 +356,8 @@ static struct pci_device_id gemtek_pci_id[] =
 
 MODULE_DEVICE_TABLE(pci, gemtek_pci_id);
 
-static int gemtek_pci_open(struct file *file)
-{
-       return 0;
-}
-
-static int gemtek_pci_release(struct file *file)
-{
-       return 0;
-}
-
 static const struct v4l2_file_operations gemtek_pci_fops = {
        .owner          = THIS_MODULE,
-       .open           = gemtek_pci_open,
-       .release        = gemtek_pci_release,
        .ioctl          = video_ioctl2,
 };
 

diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index 1504644..73985f6 100644 (file)
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -375,20 +375,9 @@ static int gemtek_probe(struct gemtek *gt)
 /*
  * Video 4 Linux stuff.
  */
-static int gemtek_open(struct file *file)
-{
-       return 0;
-}
-
-static int gemtek_release(struct file *file)
-{
-       return 0;
-}
 
 static const struct v4l2_file_operations gemtek_fops = {
        .owner          = THIS_MODULE,
-       .open           = gemtek_open,
-       .release        = gemtek_release,
        .ioctl          = video_ioctl2,
 };
 

diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
index 01a6d22..64d737c 100644 (file)
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -292,20 +292,8 @@ static int vidioc_s_audio(struct file *file, void *priv,
        return a->index ? -EINVAL : 0;
 }
 
-static int maestro_open(struct file *file)
-{
-       return 0;
-}
-
-static int maestro_release(struct file *file)
-{
-       return 0;
-}
-
 static const struct v4l2_file_operations maestro_fops = {
        .owner          = THIS_MODULE,
-       .open           = maestro_open,
-       .release        = maestro_release,
        .ioctl          = video_ioctl2,
 };
 

diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 2606f0b..3da51fe 100644 (file)
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -339,20 +339,8 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
        return -EINVAL;
 }
 
-static int maxiradio_open(struct file *file)
-{
-       return 0;
-}
-
-static int maxiradio_release(struct file *file)
-{
-       return 0;
-}
-
 static const struct v4l2_file_operations maxiradio_fops = {
        .owner          = THIS_MODULE,
-       .open           = maxiradio_open,
-       .release        = maxiradio_release,
        .ioctl          = video_ioctl2,
 };
 

diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index d1e6b01..9cb193f 100644 (file)
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -260,20 +260,8 @@ static int vidioc_s_audio(struct file *file, void *priv,
        return a->index ? -EINVAL : 0;
 }
 
-static int rtrack2_open(struct file *file)
-{
-       return 0;
-}
-
-static int rtrack2_release(struct file *file)
-{
-       return 0;
-}
-
 static const struct v4l2_file_operations rtrack2_fops = {
        .owner          = THIS_MODULE,
-       .open           = rtrack2_open,
-       .release        = rtrack2_release,
        .ioctl          = video_ioctl2,
 };
 

diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index f4784f0..1dba8f0 100644 (file)
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -260,20 +260,8 @@ static int vidioc_s_audio(struct file *file, void *priv,
        return a->index ? -EINVAL : 0;
 }
 
-static int fmi_open(struct file *file)
-{
-       return 0;
-}
-
-static int fmi_release(struct file *file)
-{
-       return 0;
-}
-
 static const struct v4l2_file_operations fmi_fops = {
        .owner          = THIS_MODULE,
-       .open           = fmi_open,
-       .release        = fmi_release,
        .ioctl          = video_ioctl2,
 };
 

diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index 0ba9d88..c09ca86 100644 (file)
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -377,20 +377,8 @@ static int vidioc_s_audio(struct file *file, void *priv,
        return a->index ? -EINVAL : 0;
 }
 
-static int fmr2_open(struct file *file)
-{
-       return 0;
-}
-
-static int fmr2_release(struct file *file)
-{
-       return 0;
-}
-
 static const struct v4l2_file_operations fmr2_fops = {
        .owner          = THIS_MODULE,
-       .open           = fmr2_open,
-       .release        = fmr2_release,
        .ioctl          = video_ioctl2,
 };
 

diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index 5b007f5..699db9a 100644 (file)
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -332,20 +332,8 @@ static int vidioc_s_audio(struct file *file, void *priv,
        return a->index ? -EINVAL : 0;
 }
 
-static int terratec_open(struct file *file)
-{
-       return 0;
-}
-
-static int terratec_release(struct file *file)
-{
-       return 0;
-}
-
 static const struct v4l2_file_operations terratec_fops = {
        .owner          = THIS_MODULE,
-       .open           = terratec_open,
-       .release        = terratec_release,
        .ioctl          = video_ioctl2,
 };
 

diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c
index d1be649..6f9ecc3 100644 (file)
--- a/drivers/media/radio/radio-trust.c
+++ b/drivers/media/radio/radio-trust.c
@@ -338,20 +338,8 @@ static int vidioc_s_audio(struct file *file, void *priv,
        return a->index ? -EINVAL : 0;
 }
 
-static int trust_open(struct file *file)
-{
-       return 0;
-}
-
-static int trust_release(struct file *file)
-{
-       return 0;
-}
-
 static const struct v4l2_file_operations trust_fops = {
        .owner          = THIS_MODULE,
-       .open           = trust_open,
-       .release        = trust_release,
        .ioctl          = video_ioctl2,
 };
 

diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index 92d923c..3a98f13 100644 (file)
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -314,20 +314,8 @@ static int vidioc_log_status(struct file *file, void *priv)
        return 0;
 }
 
-static int typhoon_open(struct file *file)
-{
-       return 0;
-}
-
-static int typhoon_release(struct file *file)
-{
-       return 0;
-}
-
 static const struct v4l2_file_operations typhoon_fops = {
        .owner          = THIS_MODULE,
-       .open           = typhoon_open,
-       .release        = typhoon_release,
        .ioctl          = video_ioctl2,
 };
 

diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index 1f85f20..80e98b6 100644 (file)
--- a/drivers/media/radio/radio-zoltrix.c
+++ b/drivers/media/radio/radio-zoltrix.c
@@ -370,21 +370,9 @@ static int vidioc_s_audio(struct file *file, void *priv,
        return a->index ? -EINVAL : 0;
 }
 
-static int zoltrix_open(struct file *file)
-{
-       return 0;
-}
-
-static int zoltrix_release(struct file *file)
-{
-       return 0;
-}
-
 static const struct v4l2_file_operations zoltrix_fops =
 {
        .owner          = THIS_MODULE,
-       .open           = zoltrix_open,
-       .release        = zoltrix_release,
        .ioctl          = video_ioctl2,
 };