@@ -112,8 +112,6 @@ struct vicodec_ctx {
struct v4l2_ctrl_handler hdl;
- /* Abort requested by m2m */
- int aborting;
struct vb2_v4l2_buffer *last_src_buf;
struct vb2_v4l2_buffer *last_dst_buf;
@@ -376,14 +374,6 @@ static int job_ready(void *priv)
return 1;
}
-static void job_abort(void *priv)
-{
- struct vicodec_ctx *ctx = priv;
-
- /* Will cancel the transaction in the next interrupt handler */
- ctx->aborting = 1;
-}
-
/*
* video ioctls
*/
@@ -1268,7 +1258,6 @@ static const struct video_device vicodec_videodev = {
static const struct v4l2_m2m_ops m2m_ops = {
.device_run = device_run,
- .job_abort = job_abort,
.job_ready = job_ready,
};
The vicodec does not use the aborting field. In fact, this driver can't really cancel any work, since it performs all the work in device_run(). Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> --- drivers/media/platform/vicodec/vicodec-core.c | 11 ----------- 1 file changed, 11 deletions(-)