Commit cb778f5c authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

media: coda: rename the picture run timeout error handler 

I would have liked the the picture run timeout error handler to be renamed to
something a bit more descriptive in the original commit fb2be08f ("[media]
coda: first step at error recovery").
Somehow v1 [1] was merged instead of v2 [2].

[1] https://patchwork.kernel.org/patch/9663965/
[2] https://patchwork.kernel.org/patch/9774239/



Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hansverk@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent bc8e2d62

drivers/media/platform/coda/coda-bit.c

+2 −2
Original line number Diff line number Diff line
@@ -2198,7 +2198,7 @@ static void coda_finish_decode(struct coda_ctx *ctx) 
	ctx->display_idx = display_idx;

}



static void coda_error_decode(struct coda_ctx *ctx)

static void coda_decode_timeout(struct coda_ctx *ctx)

{

	struct vb2_v4l2_buffer *dst_buf;
@@ -2223,7 +2223,7 @@ const struct coda_context_ops coda_bit_decode_ops = { 
	.start_streaming = coda_start_decoding,

	.prepare_run = coda_prepare_decode,

	.finish_run = coda_finish_decode,

	.error_run = coda_error_decode,

	.run_timeout = coda_decode_timeout,

	.seq_end_work = coda_seq_end_work,

	.release = coda_bit_release,

};

drivers/media/platform/coda/coda-common.c

+2 −2
Original line number Diff line number Diff line
@@ -1164,8 +1164,8 @@ static void coda_pic_run_work(struct work_struct *work) 


		coda_hw_reset(ctx);



		if (ctx->ops->error_run)

			ctx->ops->error_run(ctx);

		if (ctx->ops->run_timeout)

			ctx->ops->run_timeout(ctx);

	} else if (!ctx->aborting) {

		ctx->ops->finish_run(ctx);

	}

drivers/media/platform/coda/coda.h

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ struct coda_context_ops { 
	int (*start_streaming)(struct coda_ctx *ctx);

	int (*prepare_run)(struct coda_ctx *ctx);

	void (*finish_run)(struct coda_ctx *ctx);

	void (*error_run)(struct coda_ctx *ctx);

	void (*run_timeout)(struct coda_ctx *ctx);

	void (*seq_end_work)(struct work_struct *work);

	void (*release)(struct coda_ctx *ctx);

};