[media] dvb core: remove support for post FE legacy ioctl intercept

This DVB_FE_IOCTL_POST isn't used, so remove it.

Also, intercepting ioctl's like that only works with legacy ioctl's,
due to the way it was implemented. so this design is broken.
Document it.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index aebcdf221ddacece9fd1413aa2c9906c836c88ba..746dfd86aeabe6943cbaaeff64a9083ac5fb6104 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -2287,13 +2287,6 @@ static int dvb_frontend_ioctl_legacy(struct file *file,
                break;
        };
 
-       if (fe->dvb->fe_ioctl_override) {
-               cb_err = fe->dvb->fe_ioctl_override(fe, cmd, parg,
-                                                   DVB_FE_IOCTL_POST);
-               if (cb_err < 0)
-                       return cb_err;
-       }
-
        return err;
 }
 

diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb/dvb-core/dvbdev.h
index fcc6ae98745e018588d21d83af953c6765aad85c..3b2c137b182c43b7ea824e8a19497e3eb1d1b954 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvbdev.h
+++ b/drivers/media/dvb/dvb-core/dvbdev.h
@@ -76,7 +76,6 @@ struct dvb_adapter {
         * after the core handles an ioctl:
         *
         * DVB_FE_IOCTL_PRE indicates that the ioctl has not yet been handled.
-        * DVB_FE_IOCTL_POST indicates that the ioctl has been handled.
         *
         * When DVB_FE_IOCTL_PRE is passed to the callback as the stage arg:
         *
@@ -86,14 +85,10 @@ struct dvb_adapter {
         * return a negative int to prevent dvb-core from handling the ioctl,
         *      and return that value as an error.
         *
-        * When DVB_FE_IOCTL_POST is passed to the callback as the stage arg:
-        *
-        * return 0 to allow the dvb_frontend ioctl handler to exit normally.
-        * return a negative int to cause the dvb_frontend ioctl handler to
-        *      return that value as an error.
+        * WARNING: Don't use it on newer drivers: this only affects DVBv3
+        * calls, and should be removed soon.
         */
 #define DVB_FE_IOCTL_PRE 0
-#define DVB_FE_IOCTL_POST 1
        int (*fe_ioctl_override)(struct dvb_frontend *fe,
                                 unsigned int cmd, void *parg,
                                 unsigned int stage);

diff --git a/drivers/media/dvb/dvb-usb-v2/mxl111sf.c b/drivers/media/dvb/dvb-usb-v2/mxl111sf.c
index 1fb017ecee74a18cf92c498abb7066d37dfe5d83..861e0ae2abc53014f5311aefe145e6a2502adcea 100644 (file)
--- a/drivers/media/dvb/dvb-usb-v2/mxl111sf.c
+++ b/drivers/media/dvb/dvb-usb-v2/mxl111sf.c
@@ -898,10 +898,6 @@ static int mxl111sf_fe_ioctl_override(struct dvb_frontend *fe,
                        break;
                }
                break;
-
-       case DVB_FE_IOCTL_POST:
-               /* no post-ioctl handling required */
-               break;
        }
        return err;
 };