Skip to content

Commit

Permalink
[media] dvb core: remove support for post FE legacy ioctl intercept
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mauro Carvalho Chehab committed Aug 12, 2012
1 parent 8d9b258 commit 9468542
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 18 deletions.
7 changes: 0 additions & 7 deletions drivers/media/dvb/dvb-core/dvb_frontend.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
9 changes: 2 additions & 7 deletions drivers/media/dvb/dvb-core/dvbdev.h
Original file line number Diff line number Diff line change
Expand Up @@ -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:
*
Expand All @@ -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);
Expand Down
4 changes: 0 additions & 4 deletions drivers/media/dvb/dvb-usb-v2/mxl111sf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down

0 comments on commit 9468542

Please sign in to comment.