From patchwork Tue May 28 07:26:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 18575 X-Patchwork-Delegate: kamil@wypas.org Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UhEUD-0003dR-JG; Tue, 28 May 2013 09:38:25 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-6) with esmtp id 1UhEUB-0000DF-5S; Tue, 28 May 2013 09:38:25 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759084Ab3E1H06 (ORCPT + 1 other); Tue, 28 May 2013 03:26:58 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:47748 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758927Ab3E1H05 (ORCPT ); Tue, 28 May 2013 03:26:57 -0400 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout2.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MNH00BQBZAWJB70@mailout2.w1.samsung.com> for linux-media@vger.kernel.org; Tue, 28 May 2013 08:26:56 +0100 (BST) X-AuditID: cbfec7f5-b7f376d000001ec6-30-51a45c40092f Received: from eusync4.samsung.com ( [203.254.199.214]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id D0.D9.07878.04C54A15; Tue, 28 May 2013 08:26:56 +0100 (BST) Received: from AMDC1061.digital.local ([106.116.147.88]) by eusync4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MNH007RJZC6A160@eusync4.samsung.com>; Tue, 28 May 2013 08:26:56 +0100 (BST) From: Andrzej Hajda To: Kamil Debski , linux-media@vger.kernel.org Cc: Jeongtae Park , Sylwester Nawrocki , Kyungmin Park , Andrzej Hajda Subject: [PATCH 2/3] s5p-mfc: v4l2 controls setup routine moved to initialization code Date: Tue, 28 May 2013 09:26:15 +0200 Message-id: <1369725976-7828-3-git-send-email-a.hajda@samsung.com> X-Mailer: git-send-email 1.8.1.2 In-reply-to: <1369725976-7828-1-git-send-email-a.hajda@samsung.com> References: <1369725976-7828-1-git-send-email-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrIJMWRmVeSWpSXmKPExsVy+t/xa7oOMUsCDa5MZre4te4cq8WRtVeZ LH68vsBmcbbpDbtFz4atrBaH37SzOrB59G1ZxejxeZNcAFMUl01Kak5mWWqRvl0CV8bhNfNY C85wVdyauIC5gbGLs4uRk0NCwESi91cLM4QtJnHh3nq2LkYuDiGBpYwSzy+sYIFw+pgkWn/v A6tiE9CU+Lv5JhuILSLgIrFwx2lGkCJmgZWMEtsnzQJLCAtESBzu38cKYrMIqEq8Pr6WEcTm FXCSuPl9CiPEOgWJn5dPANVzcHAKOEusmGoPYgoBldw9XDmBkXcBI8MqRtHU0uSC4qT0XCO9 4sTc4tK8dL3k/NxNjJBg+bqDcekxq0OMAhyMSjy8E7MXBwqxJpYVV+YeYpTgYFYS4RXxXxIo xJuSWFmVWpQfX1Sak1p8iJGJg1OqgXFJpsXyJ2tvbrod7ay/IeMe2yYf5cI+dnebTeu6uzQc J71J38FXwMO06FTp4cq6f1u+i/Lf/qS03/oJZ53EiUs1JTEL+3T3Kt6+Gxu/W+j73sP6c3ex 2dxfb1GiPof72vuOt95103gt/5csydQMeLF9ivBL1+P1HgFrf/GZTJy89G1OcvRK/lVKLMUZ iYZazEXFiQD17R/V9AEAAA== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.5.28.73017 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' HTML_NO_HTTP 0.1, MULTIPLE_RCPTS 0.1, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1500_1599 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_HTML 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS ' Callback .start_streaming is called once for every queue, so v4l2_ctrl_handler_setup was called twice during stream start. Moving v4l2_ctrl_handler_setup to context initialization reduces numbers of calls and seems to be more consistent with API. Signed-off-by: Andrzej Hajda Signed-off-by: Kyungmin Park --- drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c index 4f6b553..64bb31e 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c @@ -1760,7 +1760,6 @@ static int s5p_mfc_start_streaming(struct vb2_queue *q, unsigned int count) struct s5p_mfc_ctx *ctx = fh_to_ctx(q->drv_priv); struct s5p_mfc_dev *dev = ctx->dev; - v4l2_ctrl_handler_setup(&ctx->ctrl_handler); /* If context is ready then dev = work->data;schedule it to run */ if (s5p_mfc_ctx_ready(ctx)) set_work_bit_irqsave(ctx); @@ -1920,6 +1919,7 @@ int s5p_mfc_enc_ctrls_setup(struct s5p_mfc_ctx *ctx) if (controls[i].is_volatile && ctx->ctrls[i]) ctx->ctrls[i]->flags |= V4L2_CTRL_FLAG_VOLATILE; } + v4l2_ctrl_handler_setup(&ctx->ctrl_handler); return 0; }