From patchwork Thu Dec 18 14:49:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 27571 X-Patchwork-Delegate: g.liakhovetski@gmx.de Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1Y1cOv-0003jY-Ts; Thu, 18 Dec 2014 15:50:01 +0100 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-5) with esmtp id 1Y1cOt-0006cF-8v; Thu, 18 Dec 2014 15:50:01 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751104AbaLROt5 (ORCPT + 1 other); Thu, 18 Dec 2014 09:49:57 -0500 Received: from ducie-dc1.codethink.co.uk ([185.25.241.215]:52220 "EHLO ducie-dc1.codethink.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750899AbaLROt5 (ORCPT ); Thu, 18 Dec 2014 09:49:57 -0500 Received: from localhost (localhost [127.0.0.1]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTP id 153CE460647; Thu, 18 Dec 2014 14:49:56 +0000 (GMT) X-Virus-Scanned: Debian amavisd-new at ducie-dc1.codethink.co.uk Received: from ducie-dc1.codethink.co.uk ([127.0.0.1]) by localhost (ducie-dc1.codethink.co.uk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1NjJPPimP6Oa; Thu, 18 Dec 2014 14:49:53 +0000 (GMT) Received: from [10.24.1.188] (xylophone.dyn.ducie.codethink.co.uk [10.24.1.188]) by ducie-dc1.codethink.co.uk (Postfix) with ESMTPSA id 4824D46011C; Thu, 18 Dec 2014 14:49:53 +0000 (GMT) Message-ID: <1418914193.22813.17.camel@xylophone.i.decadent.org.uk> Subject: [RFC PATCH 4/5] media: rcar_vin: Clean up rcar_vin_irq From: Ben Hutchings To: linux-media@vger.kernel.org Cc: Guennadi Liakhovetski , linux-kernel@codethink.co.uk, William Towle , Sergei Shtylyov , Hans Verkuil Date: Thu, 18 Dec 2014 14:49:53 +0000 In-Reply-To: <1418914070.22813.13.camel@xylophone.i.decadent.org.uk> References: <1418914070.22813.13.camel@xylophone.i.decadent.org.uk> Organization: Codethink Ltd. X-Mailer: Evolution 3.4.4-3 Mime-Version: 1.0 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: 2014.12.18.144220 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, MIME_LOWER_CASE 0.05, MSGID_ADDED_BY_MTA 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, CT_TEXT_PLAIN_UTF8_CAPS 0, REFERENCES 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __LINES_OF_YELLING 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __REFERENCES 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' From: Ian Molton This patch makes the rcar_vin IRQ handler a little more readable. Removes an else clause, and simplifies the buffer handling. Signed-off-by: Ian Molton Reviewed-by: William Towle --- drivers/media/platform/soc_camera/rcar_vin.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c index b234e57..20dbedf 100644 --- a/drivers/media/platform/soc_camera/rcar_vin.c +++ b/drivers/media/platform/soc_camera/rcar_vin.c @@ -557,7 +557,6 @@ static irqreturn_t rcar_vin_irq(int irq, void *data) struct rcar_vin_priv *priv = data; u32 int_status; bool can_run = false, hw_stopped; - int slot; unsigned int handled = 0; spin_lock(&priv->lock); @@ -576,17 +575,22 @@ static irqreturn_t rcar_vin_irq(int irq, void *data) hw_stopped = !(ioread32(priv->base + VNMS_REG) & VNMS_CA); if (!priv->request_to_stop) { + struct vb2_buffer **q_entry = priv->queue_buf; + struct vb2_buffer *vb; + if (is_continuous_transfer(priv)) - slot = (ioread32(priv->base + VNMS_REG) & - VNMS_FBS_MASK) >> VNMS_FBS_SHIFT; - else - slot = 0; + q_entry += (ioread32(priv->base + VNMS_REG) & + VNMS_FBS_MASK) >> VNMS_FBS_SHIFT; + + vb = *q_entry; + + vb->v4l2_buf.field = priv->field; + vb->v4l2_buf.sequence = priv->sequence++; + do_gettimeofday(&vb->v4l2_buf.timestamp); + + vb2_buffer_done(vb, VB2_BUF_STATE_DONE); - priv->queue_buf[slot]->v4l2_buf.field = priv->field; - priv->queue_buf[slot]->v4l2_buf.sequence = priv->sequence++; - do_gettimeofday(&priv->queue_buf[slot]->v4l2_buf.timestamp); - vb2_buffer_done(priv->queue_buf[slot], VB2_BUF_STATE_DONE); - priv->queue_buf[slot] = NULL; + *q_entry = NULL; if (priv->state != STOPPING) can_run = rcar_vin_fill_hw_slot(priv);