diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb/dvb-core/dvb_frontend.c | 7 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/dvbdev.h | 9 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb-v2/mxl111sf.c | 4 |
3 files changed, 2 insertions, 18 deletions
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c index aebcdf221dda..746dfd86aeab 100644 --- 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 fcc6ae98745e..3b2c137b182c 100644 --- 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 1fb017ecee74..861e0ae2abc5 100644 --- 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; }; |